Address review comments

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

diff --git a/include/llvm/IR/Mangler.h b/include/llvm/IR/Mangler.h
index 1e6b5b1dca0062f5b7f8e7e26e1bc9db0369357f..b44d1c8c2323fad90688eafb8d01b9a390a4dfdf 100644 (file)
--- a/include/llvm/IR/Mangler.h
+++ b/include/llvm/IR/Mangler.h
@@ -52,9 +52,11 @@ public:
   /// If the global variable doesn't have a name, this fills in a unique name
   /// for the global.
   void getNameWithPrefix(raw_ostream &OS, const GlobalValue *GV,
-                         bool CannotUsePrivateLabel) const;
+                         bool CannotUsePrivateLabel,
+                         bool ForceNonPrivate = false) const;
   void getNameWithPrefix(SmallVectorImpl<char> &OutName, const GlobalValue *GV,
-                         bool CannotUsePrivateLabel) const;
+                         bool CannotUsePrivateLabel,
+                         bool ForceNonPrivate = false) const;
 
   /// Print the appropriate prefix and the specified name as the global variable
   /// name. GVName must not be empty.

diff --git a/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
index 5a8367eea77bbce20f21758b10db881ea6d63e35..10729cd81a5fd67cba55724de1f63de383dbc56d 100644 (file)
--- a/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
+++ b/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
@@ -960,13 +960,8 @@ void TargetLoweringObjectFileCOFF::getNameWithPrefix(
       ((isa<Function>(GV) && TM.getFunctionSections()) ||
        (isa<GlobalVariable>(GV) && TM.getDataSections()))) {
     SmallString<256> Tmp;
-    Mang.getNameWithPrefix(Tmp, GV, /*CannotUsePrivateLabel=*/false);
-    if (Tmp.startswith(".L"))
-      OutName.append(Tmp.begin() + 2, Tmp.end());
-    else if (Tmp.startswith("L"))
-      OutName.append(Tmp.begin() + 1, Tmp.end());
-    else
-      OutName.append(Tmp.begin(), Tmp.end());
+    Mang.getNameWithPrefix(Tmp, GV, CannotUsePrivateLabel, /*ForceNonPrivate=*/true);
+    OutName.append(Tmp.begin(), Tmp.end());
     return;
   }
   Mang.getNameWithPrefix(OutName, GV, CannotUsePrivateLabel);

diff --git a/lib/IR/Mangler.cpp b/lib/IR/Mangler.cpp
index a0e1b25056c93b1fa220193f72a044b2ba1de24a..2ba5998c8052006f0869c6eb51b0310a09362153 100644 (file)
--- a/lib/IR/Mangler.cpp
+++ b/lib/IR/Mangler.cpp
@@ -91,9 +91,10 @@ static void addByteCountSuffix(raw_ostream &OS, const Function *F,
 }
 
 void Mangler::getNameWithPrefix(raw_ostream &OS, const GlobalValue *GV,
-                                bool CannotUsePrivateLabel) const {
+                                bool CannotUsePrivateLabel,
+                                bool ForceNonPrivate) const {
   ManglerPrefixTy PrefixTy = Mangler::Default;
-  if (GV->hasPrivateLinkage()) {
+  if (GV->hasPrivateLinkage() && !ForceNonPrivate) {
     if (CannotUsePrivateLabel)
       PrefixTy = Mangler::LinkerPrivate;
     else
@@ -152,7 +153,8 @@ void Mangler::getNameWithPrefix(raw_ostream &OS, const GlobalValue *GV,
 
 void Mangler::getNameWithPrefix(SmallVectorImpl<char> &OutName,
                                 const GlobalValue *GV,
-                                bool CannotUsePrivateLabel) const {
+                                bool CannotUsePrivateLabel,
+                                bool ForceNonPrivate) const {
   raw_svector_ostream OS(OutName);
-  getNameWithPrefix(OS, GV, CannotUsePrivateLabel);
+  getNameWithPrefix(OS, GV, CannotUsePrivateLabel, ForceNonPrivate);
 }