apply jhuber6's symbol/dependency patch

Author: JonChesterfield

llvm/include/llvm/Transforms/IPO/ExpandVariadics.h

@@ -30,9 +30,6 @@ class ExpandVariadicsPass : public PassInfoMixin<ExpandVariadicsPass> {
   // Operates under passed mode unless overridden on commandline
   ExpandVariadicsPass(ExpandVariadicsMode ConstructedMode);
 
-  // Chooses disable or optimize based on optimization level
-  ExpandVariadicsPass(OptimizationLevel Level);
-
   PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
 };
 

llvm/lib/Passes/PassBuilderPipelines.cpp

@@ -1174,8 +1174,11 @@ PassBuilder::buildModuleSimplificationPipeline(OptimizationLevel Level,
     MPM.addPass(PGOForceFunctionAttrsPass(PGOOpt->ColdOptType));
 
   // ExpandVariadics interacts well with the function inliner.
-  MPM.addPass(ExpandVariadicsPass(Level));
+  MPM.addPass(ExpandVariadicsPass(Level == OptimizationLevel::O0
+                                  ? ExpandVariadicsMode::Disable
+                                  : ExpandVariadicsMode::Optimize));
 
+  
   MPM.addPass(AlwaysInlinerPass(/*InsertLifetimeIntrinsics=*/true));
 
   if (EnableModuleInliner)

llvm/lib/Passes/PassRegistry.def

@@ -59,7 +59,7 @@ MODULE_PASS("dot-callgraph", CallGraphDOTPrinterPass())
 MODULE_PASS("dxil-upgrade", DXILUpgradePass())
 MODULE_PASS("elim-avail-extern", EliminateAvailableExternallyPass())
 MODULE_PASS("extract-blocks", BlockExtractorPass({}, false))
-MODULE_PASS("expand-variadics", ExpandVariadicsPass(OptimizationLevel::O0))
+MODULE_PASS("expand-variadics", ExpandVariadicsPass(ExpandVariadicsMode::Disable))
 MODULE_PASS("forceattrs", ForceFunctionAttrsPass())
 MODULE_PASS("function-import", FunctionImportPass())
 MODULE_PASS("globalopt", GlobalOptPass())

llvm/lib/Transforms/IPO/ExpandVariadics.cpp

@@ -1046,10 +1046,5 @@ PreservedAnalyses ExpandVariadicsPass::run(Module &M, ModuleAnalysisManager &) {
              : PreservedAnalyses::all();
 }
 
-ExpandVariadicsPass::ExpandVariadicsPass(OptimizationLevel Level)
-    : ExpandVariadicsPass(Level == OptimizationLevel::O0
-                              ? ExpandVariadicsMode::Disable
-                              : ExpandVariadicsMode::Optimize) {}
-
 ExpandVariadicsPass::ExpandVariadicsPass(ExpandVariadicsMode Mode)
     : ConstructedMode(Mode) {}