commit f41860c8825cc6e9cd26796e4246eb5b7e435573
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Jan 31 07:04:41 2011 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Jan 31 07:04:41 2011 +0000
tree c355900375a098c475bdc5fc1a866c6c921ab878
parent 77fd99f8ae9f74185d198a1b665bf0ba19d65ad6

'extern' variables in functions don't shadow externs in global scope. Fixes rdar://8883302.

llvm-svn: 124578

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 1c487b8..bcc67b2 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -3117,6 +3117,19 @@
 
   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())
+        return;
+
   // Only warn about certain kinds of shadowing for class members.
   if (NewDC && NewDC->isRecord()) {
     // In particular, don't warn about shadowing non-class members.