diff options
| -rw-r--r-- | lib/CodeGen/Mangle.cpp | 16 | ||||
| -rw-r--r-- | test/CodeGenCXX/mangle.cpp | 5 |
2 files changed, 18 insertions, 3 deletions
diff --git a/lib/CodeGen/Mangle.cpp b/lib/CodeGen/Mangle.cpp index 6e62fcfc2e..3e685e6b17 100644 --- a/lib/CodeGen/Mangle.cpp +++ b/lib/CodeGen/Mangle.cpp @@ -42,6 +42,7 @@ namespace { void mangleName(const NamedDecl *ND); void mangleUnqualifiedName(const NamedDecl *ND); void mangleSourceName(const IdentifierInfo *II); + void mangleLocalName(const NamedDecl *ND); void mangleNestedName(const NamedDecl *ND); void manglePrefix(const DeclContext *DC); void mangleOperatorName(OverloadedOperatorKind OO, unsigned Arity); @@ -149,9 +150,10 @@ void CXXNameMangler::mangleName(const NamedDecl *ND) { else if (isStdNamespace(ND->getDeclContext())) { Out << "St"; mangleUnqualifiedName(ND); - } else { + } else if (isa<FunctionDecl>(ND->getDeclContext())) + mangleLocalName(ND); + else mangleNestedName(ND); - } } void CXXNameMangler::mangleUnqualifiedName(const NamedDecl *ND) { @@ -226,6 +228,16 @@ void CXXNameMangler::mangleNestedName(const NamedDecl *ND) { Out << 'E'; } +void CXXNameMangler::mangleLocalName(const NamedDecl *ND) { + // <local-name> := Z <function encoding> E <entity name> [<discriminator>] + // := Z <function encoding> E s [<discriminator>] + // <discriminator> := _ <non-negative number> + Out << 'Z'; + mangleFunctionEncoding(cast<FunctionDecl>(ND->getDeclContext())); + Out << 'E'; + mangleSourceName(ND->getIdentifier()); +} + void CXXNameMangler::manglePrefix(const DeclContext *DC) { // <prefix> ::= <prefix> <unqualified-name> // ::= <template-prefix> <template-args> diff --git a/test/CodeGenCXX/mangle.cpp b/test/CodeGenCXX/mangle.cpp index e9a76c93f0..f608a22f03 100644 --- a/test/CodeGenCXX/mangle.cpp +++ b/test/CodeGenCXX/mangle.cpp @@ -39,5 +39,8 @@ extern "C" { namespace N { void unmangled_function() { } } } // RUN: grep unmangled_variable %t | count 1 && extern "C" { namespace N { int unmangled_variable; } } -// RUN: grep _ZN1N1iE %t | count 1 +// RUN: grep _ZN1N1iE %t | count 1 && namespace N { int i; } + +// RUN: grep _ZZN1N1fEiiE1b %t | count 2 +namespace N { int f(int, int) { static int b; return b; } } |