commit 857dd066052e0883ca1f9da42883e9ab8367fb88
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Jan 31 07:04:50 2011 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Jan 31 07:04:50 2011 +0000
tree 1c1630150c6156ff7d5d5137594b5eebd89129e1
parent 819f610942163a1f17d507c202042138e48f3cc2

Fix the diagnostic when we are shadowing an external variable and there exists a locally scoped extern with the same name.

llvm-svn: 124580

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 24307c9..253f1dc 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -3129,21 +3129,32 @@
   if (!isa<VarDecl>(ShadowedDecl) && !isa<FieldDecl>(ShadowedDecl))
     return;
 
-  DeclContext *OldDC = ShadowedDecl->getDeclContext();
-
-  // Don't warn for this case:
-  //
-  // @code
-  // extern int bob;
-  // void f() {
-  //   extern int bob;
-  // }
-  // @endcode
-  if (D->isExternC() && NewDC->isFunctionOrMethod())
-    if (VarDecl *shadowedVar = dyn_cast<VarDecl>(ShadowedDecl))
-      if (shadowedVar->isExternC())
+  if (VarDecl *shadowedVar = dyn_cast<VarDecl>(ShadowedDecl))
+    if (shadowedVar->isExternC()) {
+      // Don't warn for this case:
+      //
+      // @code
+      // extern int bob;
+      // void f() {
+      //   extern int bob;
+      // }
+      // @endcode
+      if (D->isExternC())
         return;
 
+      // For shadowing external vars, make sure that we point to the global
+      // declaration, not a locally scoped extern declaration.
+      for (VarDecl::redecl_iterator
+             I = shadowedVar->redecls_begin(), E = shadowedVar->redecls_end();
+           I != E; ++I)
+        if (I->isFileVarDecl()) {
+          ShadowedDecl = *I;
+          break;
+        }
+    }
+
+  DeclContext *OldDC = ShadowedDecl->getDeclContext();
+
   // Only warn about certain kinds of shadowing for class members.
   if (NewDC && NewDC->isRecord()) {
     // In particular, don't warn about shadowing non-class members.