diff options
| author | bors <bors@rust-lang.org> | 2021-09-25 13:43:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-09-25 13:43:52 +0000 |
| commit | 63cc2bb3d07d6c726dfcdc5f95cbe5ed4760641a (patch) | |
| tree | b1707204606ee934c8e3981cb5c751cc80be483e /compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | |
| parent | e9f29a851917a706c01b6f51331894df1d15770b (diff) | |
| parent | 51203dc1c40393b864af70d0bc50b6c4f4ea34e4 (diff) | |
| download | rust-63cc2bb3d07d6c726dfcdc5f95cbe5ed4760641a.tar.gz rust-63cc2bb3d07d6c726dfcdc5f95cbe5ed4760641a.zip | |
Auto merge of #88243 - nikic:newpm-2, r=nagisa
Enable new pass manager with LLVM 13 The new pass manager is enabled by default in clang since Clang/LLVM 13. Per the recent discussion on llvm-dev (https://lists.llvm.org/pipermail/llvm-dev/2021-August/152305.html) the legacy pass manager will be unmaintained in LLVM 14 and removed entirely in LLVM 15. This switches us to use the new pass manager if LLVM >= 13 is used. It's possible to still use the old pass manager using `-Z new-llvm-pass-manager=no`.
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp index 1a0cfd58885..48eb50953a9 100644 --- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp @@ -1004,7 +1004,10 @@ LLVMRustOptimizeWithNewPassManager( #endif bool NeedThinLTOBufferPasses = UseThinLTOBuffers; if (!NoPrepopulatePasses) { - if (OptLevel == OptimizationLevel::O0) { + // The pre-link pipelines don't support O0 and require using budilO0DefaultPipeline() instead. + // At the same time, the LTO pipelines do support O0 and using them is required. + bool IsLTO = OptStage == LLVMRustOptStage::ThinLTO || OptStage == LLVMRustOptStage::FatLTO; + if (OptLevel == OptimizationLevel::O0 && !IsLTO) { #if LLVM_VERSION_GE(12, 0) for (const auto &C : PipelineStartEPCallbacks) PB.registerPipelineStartEPCallback(C); |