diff options
| -rw-r--r-- | lib/CodeGen/Mangle.cpp | 7 | ||||
| -rw-r--r-- | test/CodeGenCXX/mangle.cpp | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/CodeGen/Mangle.cpp b/lib/CodeGen/Mangle.cpp index 9ac5956a64..a302225c7f 100644 --- a/lib/CodeGen/Mangle.cpp +++ b/lib/CodeGen/Mangle.cpp @@ -482,9 +482,10 @@ void CXXNameMangler::mangleUnqualifiedName(const NamedDecl *ND, case DeclarationName::Identifier: { if (const IdentifierInfo *II = Name.getAsIdentifierInfo()) { // We must avoid conflicts between internally- and externally- - // linked names in the same TU. This naming convention is the - // same as that followed by GCC, though it shouldn't actually matter. - if (ND && ND->getLinkage() == InternalLinkage && + // linked variable declaration names in the same TU. + // This naming convention is the same as that followed by GCC, though it + // shouldn't actually matter. + if (ND && isa<VarDecl>(ND) && ND->getLinkage() == InternalLinkage && ND->getDeclContext()->isFileContext()) Out << 'L'; diff --git a/test/CodeGenCXX/mangle.cpp b/test/CodeGenCXX/mangle.cpp index 8f45175ae8..07183782e7 100644 --- a/test/CodeGenCXX/mangle.cpp +++ b/test/CodeGenCXX/mangle.cpp @@ -372,3 +372,7 @@ namespace test1 { // CHECK: define void @_ZN5test11fINS_1XEiEEvT_IT0_E template void f(X<int>); } + +// CHECK: define internal void @_Z27functionWithInternalLinkagev() +static void functionWithInternalLinkage() { } +void g() { functionWithInternalLinkage(); } |