diff options
| -rw-r--r-- | lib/CodeGen/Mangle.cpp | 5 | ||||
| -rw-r--r-- | test/CodeGenCXX/mangle.cpp | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/CodeGen/Mangle.cpp b/lib/CodeGen/Mangle.cpp index 973f0d188c..5a994d2234 100644 --- a/lib/CodeGen/Mangle.cpp +++ b/lib/CodeGen/Mangle.cpp @@ -279,11 +279,8 @@ void CXXNameMangler::mangleName(const NamedDecl *ND) { // ::= <local-name> // const DeclContext *DC = ND->getDeclContext(); - while (isa<LinkageSpecDecl>(DC)) { - assert(cast<LinkageSpecDecl>(DC)->getLanguage() == - LinkageSpecDecl::lang_cxx && "Unexpected linkage decl!"); + while (isa<LinkageSpecDecl>(DC)) DC = DC->getParent(); - } if (DC->isTranslationUnit() || isStdNamespace(DC)) { // Check if we have a template. diff --git a/test/CodeGenCXX/mangle.cpp b/test/CodeGenCXX/mangle.cpp index d952f31439..dbcd0c9460 100644 --- a/test/CodeGenCXX/mangle.cpp +++ b/test/CodeGenCXX/mangle.cpp @@ -130,3 +130,10 @@ extern "C++" { void h() { } } +// PR5019 +extern "C" { struct a { int b; }; } + +// CHECK: @_Z1fP1a +int f(struct a *x) { + return x->b; +} |