commit 4f9c9d659113e029b3fc67e5da2e3e44cda1e215
author Fariborz Jahanian <fjahanian@apple.com> Thu Jun 24 18:50:41 2010 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Thu Jun 24 18:50:41 2010 +0000
tree 052b2409c582c6741f74f214ab7c595fa71bf698
parent 3f0e992af11264d2f8d48d4a73f9e3131ab7cb48

Fixes a regression when redeclaration of a global satic 
is an extern local to a function. Radar 8125274.

llvm-svn: 106773

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index ebfb981..5c1de6a 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -1456,7 +1456,8 @@
   }
 
   if (New->hasExternalStorage() &&
-      Old->getLinkage() == InternalLinkage)
+      Old->getLinkage() == InternalLinkage &&
+      New->getDeclContext() == Old->getDeclContext())
     New->setStorageClass(Old->getStorageClass());
 
   // Keep a chain of previous declarations.