commit 2b0b13bc4480eaeed20af7c83673161375b46efe
author Rafael Espindola <rafael.espindola@gmail.com> Thu Apr 04 16:43:41 2013 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Thu Apr 04 16:43:41 2013 +0000
tree 8261a2b1a9fc2d6fc2594d124a4652231c3cb2f8
parent e58df62ea4b18e9e3017014d72d98592a46ada80

Fix a recent linkage regression.

Now that we don't have a semantic storage class, use the linkage.

Thanks to Bruce Stephens for reporting this.

llvm-svn: 178766

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 436fca3..af0b2bb 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -2328,7 +2328,7 @@
   // storage classes.
   if (!isa<CXXMethodDecl>(New) && !isa<CXXMethodDecl>(Old) &&
       New->getStorageClass() == SC_Static &&
-      Old->getStorageClass() != SC_Static &&
+      Old->hasExternalLinkage() &&
       !New->getTemplateSpecializationInfo() &&
       !canRedefineFunction(Old, getLangOpts())) {
     if (getLangOpts().MicrosoftExt) {

clang/test/SemaCXX/linkage2.cpp

diff --git a/clang/test/SemaCXX/linkage2.cpp b/clang/test/SemaCXX/linkage2.cpp
index 94ac25c..d1aee4e 100644
--- a/clang/test/SemaCXX/linkage2.cpp
+++ b/clang/test/SemaCXX/linkage2.cpp
@@ -134,3 +134,9 @@
     extern const int n;
   }
 }
+
+namespace test13 {
+  static void a(void);
+  extern void a();
+  static void a(void) {}
+}