commit ba2bfa07cbcb088e3afc5565a3b301a7873771a3
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 eca56e0dacb92c09d1c5791f093d503e51483441
parent 32d2a6528c395e52914df51f25af13cafaace8dd

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.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@178766 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaDecl.cpp

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 436fca3..af0b2bb 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/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) {