commit 5b34b9c5135971b01ed0dc8d4ef35cd3b79bd2c0
author Rafael Espindola <rafael.espindola@gmail.com> Fri Mar 29 07:56:05 2013 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Fri Mar 29 07:56:05 2013 +0000
tree cfae7f9d51a95956094d56128d29590158f65568
parent b6bead467640e4d05f6a0a90255eebc939f690a2

Fix thinko (and the bots): We still want to warn in C.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@178335 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaDecl.cpp

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 1c6bbed..7c109a4 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -7565,9 +7565,9 @@
     }
   } else if (VDecl->isFileVarDecl()) {
     if (VDecl->getStorageClassAsWritten() == SC_Extern &&
-        !VDecl->isExternC() &&
         (!getLangOpts().CPlusPlus ||
-         !Context.getBaseElementType(VDecl->getType()).isConstQualified()))
+         !(Context.getBaseElementType(VDecl->getType()).isConstQualified() ||
+           VDecl->isExternC())))
       Diag(VDecl->getLocation(), diag::warn_extern_init);
 
     // C99 6.7.8p4. All file scoped initializers need to be constant.