From 1d3b6f62dfe03256b0becc5c8ecfcd606df1fa6a Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Tue, 22 Sep 2009 20:33:31 +0000 Subject: CXXMethodDecls should always be mangled, even if they are inside an extern "C" block. Fixes PR5017. llvm-svn: 82567 --- clang/lib/CodeGen/Mangle.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'clang/lib/CodeGen/Mangle.cpp') diff --git a/clang/lib/CodeGen/Mangle.cpp b/clang/lib/CodeGen/Mangle.cpp index 5a994d2234b..878f13d516d 100644 --- a/clang/lib/CodeGen/Mangle.cpp +++ b/clang/lib/CodeGen/Mangle.cpp @@ -131,7 +131,7 @@ bool CXXNameMangler::mangleFunctionDecl(const FunctionDecl *FD) { return false; // No name mangling in a C linkage specification. - if (isInCLinkageSpecification(FD)) + if (!isa(FD) && isInCLinkageSpecification(FD)) return false; } @@ -502,6 +502,9 @@ void CXXNameMangler::manglePrefix(const DeclContext *DC) { // ::= // FIXME: We only handle mangling of namespaces and classes at the moment. + while (isa(DC)) + DC = DC->getParent(); + if (DC->isTranslationUnit()) return; -- cgit v1.2.3