diff options
| -rw-r--r-- | llvm/include/llvm/Target/Mangler.h | 5 | ||||
| -rw-r--r-- | llvm/lib/Target/Mangler.cpp | 31 |
2 files changed, 16 insertions, 20 deletions
diff --git a/llvm/include/llvm/Target/Mangler.h b/llvm/include/llvm/Target/Mangler.h index eee7bf6d697..fab41d2439c 100644 --- a/llvm/include/llvm/Target/Mangler.h +++ b/llvm/include/llvm/Target/Mangler.h @@ -52,14 +52,13 @@ public: /// and the specified global variable's name. If the global variable doesn't /// have a name, this fills in a unique name for the global. void getNameWithPrefix(SmallVectorImpl<char> &OutName, const GlobalValue *GV, - bool isImplicitlyPrivate, bool UseGlobalPrefix = true); + bool isImplicitlyPrivate); /// getNameWithPrefix - Fill OutName with the name of the appropriate prefix /// and the specified name as the global variable name. GVName must not be /// empty. void getNameWithPrefix(SmallVectorImpl<char> &OutName, const Twine &GVName, - ManglerPrefixTy PrefixTy = Mangler::Default, - bool UseGlobalPrefix = true); + ManglerPrefixTy PrefixTy = Mangler::Default); }; } // End llvm namespace diff --git a/llvm/lib/Target/Mangler.cpp b/llvm/lib/Target/Mangler.cpp index 38be25c330a..5430d509452 100644 --- a/llvm/lib/Target/Mangler.cpp +++ b/llvm/lib/Target/Mangler.cpp @@ -27,8 +27,7 @@ using namespace llvm; /// and the specified name as the global variable name. GVName must not be /// empty. void Mangler::getNameWithPrefix(SmallVectorImpl<char> &OutName, - const Twine &GVName, ManglerPrefixTy PrefixTy, - bool UseGlobalPrefix) { + const Twine &GVName, ManglerPrefixTy PrefixTy) { SmallString<256> TmpData; StringRef Name = GVName.toStringRef(TmpData); assert(!Name.empty() && "getNameWithPrefix requires non-empty name"); @@ -47,16 +46,15 @@ void Mangler::getNameWithPrefix(SmallVectorImpl<char> &OutName, OutName.append(Prefix, Prefix+strlen(Prefix)); } - if (UseGlobalPrefix) { - const char *Prefix = MAI->getGlobalPrefix(); - if (Prefix[0] == 0) - ; // Common noop, no prefix. - else if (Prefix[1] == 0) - OutName.push_back(Prefix[0]); // Common, one character prefix. - else - // Arbitrary length prefix. - OutName.append(Prefix, Prefix+strlen(Prefix)); - } + + const char *Prefix = MAI->getGlobalPrefix(); + if (Prefix[0] == 0) + ; // Common noop, no prefix. + else if (Prefix[1] == 0) + OutName.push_back(Prefix[0]); // Common, one character prefix. + else + // Arbitrary length prefix. + OutName.append(Prefix, Prefix+strlen(Prefix)); } // If this is a simple string that doesn't need escaping, just append it. @@ -88,8 +86,8 @@ static void AddFastCallStdCallSuffix(SmallVectorImpl<char> &OutName, /// and the specified global variable's name. If the global variable doesn't /// have a name, this fills in a unique name for the global. void Mangler::getNameWithPrefix(SmallVectorImpl<char> &OutName, - const GlobalValue *GV, bool isImplicitlyPrivate, - bool UseGlobalPrefix) { + const GlobalValue *GV, + bool isImplicitlyPrivate) { ManglerPrefixTy PrefixTy = Mangler::Default; if (GV->hasPrivateLinkage() || isImplicitlyPrivate) PrefixTy = Mangler::Private; @@ -99,7 +97,7 @@ void Mangler::getNameWithPrefix(SmallVectorImpl<char> &OutName, // If this global has a name, handle it simply. if (GV->hasName()) { StringRef Name = GV->getName(); - getNameWithPrefix(OutName, Name, PrefixTy, UseGlobalPrefix); + getNameWithPrefix(OutName, Name, PrefixTy); // No need to do anything else if the global has the special "do not mangle" // flag in the name. if (Name[0] == 1) @@ -111,8 +109,7 @@ void Mangler::getNameWithPrefix(SmallVectorImpl<char> &OutName, if (ID == 0) ID = NextAnonGlobalID++; // Must mangle the global into a unique ID. - getNameWithPrefix(OutName, "__unnamed_" + Twine(ID), PrefixTy, - UseGlobalPrefix); + getNameWithPrefix(OutName, "__unnamed_" + Twine(ID), PrefixTy); } // If we are supposed to add a microsoft-style suffix for stdcall/fastcall, |
