Revert "Address review comments"

This reverts commit r232540.  This was committed accidently.

llvm-svn: 232541

1 files changed, 4 insertions, 6 deletions

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