From: Anders Carlsson Date: Thu, 17 Sep 2009 16:12:20 +0000 (+0000) Subject: Ignore extern "C++" { } when mangling. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d58d6f778de936516d8815783f2e88348c41dce4;p=clang Ignore extern "C++" { } when mangling. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@82146 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/Mangle.cpp b/lib/CodeGen/Mangle.cpp index 8241ad61d0..aaa771b21d 100644 --- a/lib/CodeGen/Mangle.cpp +++ b/lib/CodeGen/Mangle.cpp @@ -249,14 +249,20 @@ void CXXNameMangler::mangleName(const NamedDecl *ND) { // ::= // ::= // - if (ND->getDeclContext()->isTranslationUnit() || - isStdNamespace(ND->getDeclContext())) { + const DeclContext *DC = ND->getDeclContext(); + while (isa(DC)) { + assert(cast(DC)->getLanguage() == + LinkageSpecDecl::lang_cxx && "Unexpected linkage decl!"); + DC = DC->getParent(); + } + + if (DC->isTranslationUnit() || isStdNamespace(DC)) { const FunctionDecl *FD = dyn_cast(ND); if (FD && FD->getPrimaryTemplate()) mangleUnscopedTemplateName(FD); else mangleUnscopedName(ND); - } else if (isa(ND->getDeclContext())) + } else if (isa(DC)) mangleLocalName(ND); else mangleNestedName(ND); diff --git a/test/CodeGenCXX/mangle.cpp b/test/CodeGenCXX/mangle.cpp index 65ef0083e4..98db0845c7 100644 --- a/test/CodeGenCXX/mangle.cpp +++ b/test/CodeGenCXX/mangle.cpp @@ -99,3 +99,8 @@ void g() { // CHECK: @_Z3ft2IcEvT_PFvS0_ES2_ ft2(1, 0, 0); } + +extern "C++" { + // CHECK: @_Z1hv + void h() { } +}