bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

PassWrapper: adapt for llvm/llvm-project@5445edb5d

Browse source 
As with ab5583ed1e, we had been explicitly
passing defaults whose type have changed. Rather than do an ifdef, we
simply rely on the defaults.

@rustbot label: +llvm-main
This commit is contained in:
Augie Fackler 2024-11-02 15:50:44 -04:00
parent 00ed73cdc0
commit c61312268e
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
View file

@ -777,10 +777,8 @@ extern "C" LLVMRustResult LLVMRustOptimize(
CGSCCAnalysisManager CGAM; CGSCCAnalysisManager CGAM;
ModuleAnalysisManager MAM; ModuleAnalysisManager MAM;
// FIXME: We may want to expose this as an option. StandardInstrumentations SI(TheModule->getContext(),
bool DebugPassManager = false; /*DebugLogging=*/false);
StandardInstrumentations SI(TheModule->getContext(), DebugPassManager);
SI.registerCallbacks(PIC, &MAM); SI.registerCallbacks(PIC, &MAM);
if (LLVMPluginsLen) { if (LLVMPluginsLen) {
@ -932,8 +930,9 @@ extern "C" LLVMRustResult LLVMRustOptimize(
for (const auto &C : OptimizerLastEPCallbacks) for (const auto &C : OptimizerLastEPCallbacks)
PB.registerOptimizerLastEPCallback(C); PB.registerOptimizerLastEPCallback(C);
// Pass false as we manually schedule ThinLTOBufferPasses below. // We manually schedule ThinLTOBufferPasses below, so don't pass the value
MPM = PB.buildO0DefaultPipeline(OptLevel, /* PreLinkLTO */ false); // to enable it here.
MPM = PB.buildO0DefaultPipeline(OptLevel);
} else { } else {
for (const auto &C : PipelineStartEPCallbacks) for (const auto &C : PipelineStartEPCallbacks)
PB.registerPipelineStartEPCallback(C); PB.registerPipelineStartEPCallback(C);
@ -942,7 +941,7 @@ extern "C" LLVMRustResult LLVMRustOptimize(
switch (OptStage) { switch (OptStage) {
case LLVMRustOptStage::PreLinkNoLTO: case LLVMRustOptStage::PreLinkNoLTO:
MPM = PB.buildPerModuleDefaultPipeline(OptLevel, DebugPassManager); MPM = PB.buildPerModuleDefaultPipeline(OptLevel);
break; break;
case LLVMRustOptStage::PreLinkThinLTO: case LLVMRustOptStage::PreLinkThinLTO:
MPM = PB.buildThinLTOPreLinkDefaultPipeline(OptLevel); MPM = PB.buildThinLTOPreLinkDefaultPipeline(OptLevel);