Use GlobalMergeFuncPass

Author: paperchalice

llvm/lib/Passes/PassBuilderCodeGen.cpp

@@ -21,6 +21,7 @@
 #include "llvm/CodeGen/ExpandReductions.h"
 #include "llvm/CodeGen/FinalizeISel.h"
 #include "llvm/CodeGen/GCMetadata.h"
+#include "llvm/CodeGen/GlobalMergeFunctions.h"
 #include "llvm/CodeGen/LiveVariables.h"
 #include "llvm/CodeGen/LocalStackSlotAllocation.h"
 #include "llvm/CodeGen/LowerEmuTLS.h"
@@ -53,7 +54,6 @@
 #include "llvm/Transforms/Scalar/MergeICmps.h"
 #include "llvm/Transforms/Scalar/PartiallyInlineLibCalls.h"
 #include "llvm/Transforms/Scalar/ScalarizeMaskedMemIntrin.h"
-#include "llvm/Transforms/Scalar/TLSVariableHoist.h"
 #include "llvm/Transforms/Utils/LowerGlobalDtors.h"
 #include "llvm/Transforms/Utils/LowerInvoke.h"
 
@@ -797,15 +797,15 @@ Error PassBuilder::buildDefaultCodeGenPipeline(ModulePassManager &TopLevelMPM,
     FPM.addPass(ExpandReductionsPass());
 
   if (OptLevel != CodeGenOptLevel::None) {
-    FPM.addPass(TLSVariableHoistPass());
-
     // Convert conditional moves to conditional jumps when profitable.
     if (!CGPBO.DisableSelectOptimize)
       FPM.addPass(SelectOptimizePass(TM));
   }
 
   {
     ModulePassManager CGMPM;
+    if (CGPBO.EnableGlobalMergeFunc)
+      CGMPM.addPass(GlobalMergeFuncPass());
     AddCodeGenPreparePassesCallback(CGMPM);
     MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
     MPM.addPass(std::move(CGMPM));