Remove unused MergePrivateGlobals

Author: amy-kwan

llvm/include/llvm/CodeGen/GlobalMerge.h

@@ -28,8 +28,6 @@ struct GlobalMergeOptions {
   bool MergeConst = false;
   /// Whether we should merge global variables that have external linkage.
   bool MergeExternal = true;
-  /// Whether we should merge global variables that have private linkage.
-  bool MergePrivateGlobals = false;
   /// Whether we should merge constant global variables.
   bool MergeConstantGlobals = false;
   /// Whether we should try to optimize for size only.

llvm/include/llvm/CodeGen/Passes.h

@@ -477,7 +477,6 @@ namespace llvm {
   Pass *createGlobalMergePass(const TargetMachine *TM, unsigned MaximalOffset,
                               bool OnlyOptimizeForSize = false,
                               bool MergeExternalByDefault = false,
-                              bool MergePrivateByDefault = false,
                               bool MergeConstantByDefault = false);
 
   /// This pass splits the stack into a safe stack and an unsafe stack to

llvm/lib/CodeGen/GlobalMerge.cpp

@@ -197,12 +197,11 @@ class GlobalMerge : public FunctionPass {
 
   explicit GlobalMerge(const TargetMachine *TM, unsigned MaximalOffset,
                        bool OnlyOptimizeForSize, bool MergeExternalGlobals,
-                       bool MergePrivateGlobals, bool MergeConstantGlobals)
+                       bool MergeConstantGlobals)
       : FunctionPass(ID), TM(TM) {
     Opt.MaxOffset = MaximalOffset;
     Opt.SizeOnly = OnlyOptimizeForSize;
     Opt.MergeExternal = MergeExternalGlobals;
-    Opt.MergePrivateGlobals = MergePrivateGlobals;
     Opt.MergeConstantGlobals = MergeConstantGlobals;
     initializeGlobalMergePass(*PassRegistry::getPassRegistry());
   }
@@ -732,13 +731,10 @@ bool GlobalMergeImpl::run(Module &M) {
 Pass *llvm::createGlobalMergePass(const TargetMachine *TM, unsigned Offset,
                                   bool OnlyOptimizeForSize,
                                   bool MergeExternalByDefault,
-                                  bool MergePrivateByDefault,
                                   bool MergeConstantByDefault) {
   bool MergeExternal = (EnableGlobalMergeOnExternal == cl::BOU_UNSET) ?
     MergeExternalByDefault : (EnableGlobalMergeOnExternal == cl::BOU_TRUE);
-  bool MergeConstant = EnableGlobalMergeOnConst.getNumOccurrences() > 0
-                           ? EnableGlobalMergeOnConst
-                           : MergeConstantByDefault;
+  bool MergeConstant = EnableGlobalMergeOnConst || MergeConstantByDefault;
   return new GlobalMerge(TM, Offset, OnlyOptimizeForSize, MergeExternal,
-                         MergePrivateByDefault, MergeConstant);
+                         MergeConstant);
 }

llvm/lib/Target/PowerPC/PPCTargetMachine.cpp

@@ -501,7 +501,7 @@ void PPCPassConfig::addIRPasses() {
 
 bool PPCPassConfig::addPreISel() {
   if (EnableGlobalMerge)
-    addPass(createGlobalMergePass(TM, GlobalMergeMaxOffset, false, false, true,
+    addPass(createGlobalMergePass(TM, GlobalMergeMaxOffset, false, false,
                                   true));
 
   if (MergeStringPool && getOptLevel() != CodeGenOptLevel::None)