rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

PassWrapper: handle separate Module*SanitizerPass

Browse Source 
Change ab41eef9aca3 in LLVM split MemorySanitizerPass into
MemorySanitizerPass for functions and ModuleMemorySanitizerPass for
modules. There's a related change for ThreadSanitizerPass, and in here
since we're using a ModulePassManager I only add the module flavor of
the pass on LLVM 14.

r? @nikic cc @nagisa
This commit is contained in:
Augie Fackler
2021-09-16 11:45:38 -04:00
parent 2b5ddf36fd
commit a97f89aeb4
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
View File

@@ -875,8 +875,12 @@ LLVMRustOptimizeWithNewPassManager(
#if LLVM_VERSION_GE(11, 0) #if LLVM_VERSION_GE(11, 0)
OptimizerLastEPCallbacks.push_back( OptimizerLastEPCallbacks.push_back(
[Options](ModulePassManager &MPM, OptimizationLevel Level) { [Options](ModulePassManager &MPM, OptimizationLevel Level) {
#if LLVM_VERSION_GE(14, 0)
MPM.addPass(ModuleMemorySanitizerPass(Options));
#else
MPM.addPass(MemorySanitizerPass(Options)); MPM.addPass(MemorySanitizerPass(Options));
MPM.addPass(createModuleToFunctionPassAdaptor(MemorySanitizerPass(Options))); MPM.addPass(createModuleToFunctionPassAdaptor(MemorySanitizerPass(Options)));
#endif
} }
); );
#else #else
@@ -897,8 +901,12 @@ LLVMRustOptimizeWithNewPassManager(
#if LLVM_VERSION_GE(11, 0) #if LLVM_VERSION_GE(11, 0)
OptimizerLastEPCallbacks.push_back( OptimizerLastEPCallbacks.push_back(
[](ModulePassManager &MPM, OptimizationLevel Level) { [](ModulePassManager &MPM, OptimizationLevel Level) {
#if LLVM_VERSION_GE(14, 0)
MPM.addPass(ModuleThreadSanitizerPass());
#else
MPM.addPass(ThreadSanitizerPass()); MPM.addPass(ThreadSanitizerPass());
MPM.addPass(createModuleToFunctionPassAdaptor(ThreadSanitizerPass())); MPM.addPass(createModuleToFunctionPassAdaptor(ThreadSanitizerPass()));
#endif
} }
); );
#else #else