bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Schedule ThinLTOBuffer passes again after sanitizer passes

Browse source 
This works around a design defect in the LLVM 12 pass builder
implementation. In LLVM 13, the PreLink ThinLTO pipeline properly
respects the OptimizerLastEPCallbacks.
This commit is contained in:
Nikita Popov 2021-03-02 21:54:03 +01:00
parent ea0aa8def3
commit 9a8acea783
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1015,6 +1015,11 @@ LLVMRustOptimizeWithNewPassManager(
case LLVMRustOptStage::PreLinkThinLTO: case LLVMRustOptStage::PreLinkThinLTO:
#if LLVM_VERSION_GE(12, 0) #if LLVM_VERSION_GE(12, 0)
MPM = PB.buildThinLTOPreLinkDefaultPipeline(OptLevel); MPM = PB.buildThinLTOPreLinkDefaultPipeline(OptLevel);
// The ThinLTOPreLink pipeline already includes ThinLTOBuffer passes. However, callback
// passes may still run afterwards. This means we need to run the buffer passes again.
// FIXME: In LLVM 13, the ThinLTOPreLink pipeline also runs OptimizerLastEPCallbacks
// before the RequiredLTOPreLinkPasses, in which case we can remove these hacks.
if (OptimizerLastEPCallbacks.empty())
NeedThinLTOBufferPasses = false; NeedThinLTOBufferPasses = false;
#else #else
MPM = PB.buildThinLTOPreLinkDefaultPipeline(OptLevel, DebugPassManager); MPM = PB.buildThinLTOPreLinkDefaultPipeline(OptLevel, DebugPassManager);