From ba2bfa07cbcb088e3afc5565a3b301a7873771a3 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 4 Apr 2013 16:43:41 +0000 Subject: [PATCH] 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 | 2 +- test/SemaCXX/linkage2.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 436fca35cb..af0b2bb72c 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -2328,7 +2328,7 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, Decl *OldD, Scope *S) { // storage classes. if (!isa(New) && !isa(Old) && New->getStorageClass() == SC_Static && - Old->getStorageClass() != SC_Static && + Old->hasExternalLinkage() && !New->getTemplateSpecializationInfo() && !canRedefineFunction(Old, getLangOpts())) { if (getLangOpts().MicrosoftExt) { diff --git a/test/SemaCXX/linkage2.cpp b/test/SemaCXX/linkage2.cpp index 94ac25c99d..d1aee4e55d 100644 --- a/test/SemaCXX/linkage2.cpp +++ b/test/SemaCXX/linkage2.cpp @@ -134,3 +134,9 @@ namespace test12 { extern const int n; } } + +namespace test13 { + static void a(void); + extern void a(); + static void a(void) {} +} -- 2.40.0