Remove dead argument.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@195806 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Target/Mangler.h b/include/llvm/Target/Mangler.h
index eee7bf6d6979e422dd525a5d60de8dad66b1e951..fab41d2439ccc21c4750bb929d4dd73e56c4b0fb 100644 (file)
--- a/include/llvm/Target/Mangler.h
+++ b/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/lib/Target/Mangler.cpp b/lib/Target/Mangler.cpp
index 38be25c330ab068aaeef9b731e9876dcb6315381..5430d50945256f2a9efb21ca2a931533612592ee 100644 (file)
--- a/lib/Target/Mangler.cpp
+++ b/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,