commit 069ab0345b7d742fc258a6d296c853200c2e6c0a
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 73e865b5dffdec35821915e52f54b49da7075477
parent de657514930edc1bafe28494d0ad7c4de2a4c80a

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

llvm-svn: 178335

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 1c6bbed..7c109a4 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/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.