From 7481ae657232b2f9275be4be8f03d8d75a12dde3 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 22 Jan 2010 18:33:00 +0000 Subject: use both the Mangler and the CBE's mangler for identifiers, this should fix a problem duncan saw handling symbols with '.' in them. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94192 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/CBackend/CBackend.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/Target') diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp index 5015d1bcce..e76565517a 100644 --- a/lib/Target/CBackend/CBackend.cpp +++ b/lib/Target/CBackend/CBackend.cpp @@ -351,7 +351,7 @@ namespace { char CWriter::ID = 0; -static std::string MangleType(const std::string &S) { +static std::string CBEMangle(const std::string &S) { std::string Result; for (unsigned i = 0, e = S.size(); i != e; ++i) @@ -1460,7 +1460,7 @@ std::string CWriter::GetValueName(const Value *Operand) { if (const GlobalValue *GV = dyn_cast(Operand)) { SmallString<128> Str; Mang->getNameWithPrefix(Str, GV, false); - return Str.str().str(); + return CBEMangle(Str.str().str()); } std::string Name = Operand->getName(); @@ -2247,7 +2247,7 @@ void CWriter::printModuleTypes(const TypeSymbolTable &TST) { // Print out forward declarations for structure types before anything else! Out << "/* Structure forward decls */\n"; for (; I != End; ++I) { - std::string Name = "struct " + MangleType("l_"+I->first); + std::string Name = "struct " + CBEMangle("l_"+I->first); Out << Name << ";\n"; TypeNames.insert(std::make_pair(I->second, Name)); } @@ -2258,7 +2258,7 @@ void CWriter::printModuleTypes(const TypeSymbolTable &TST) { // for struct or opaque types. Out << "/* Typedefs */\n"; for (I = TST.begin(); I != End; ++I) { - std::string Name = MangleType("l_"+I->first); + std::string Name = CBEMangle("l_"+I->first); Out << "typedef "; printType(Out, I->second, false, Name); Out << ";\n"; -- cgit v1.2.3