Skip to content

Commit db872ee

Browse files
authored
Rollup merge of #98621 - krasimirgg:llvm-15-wrapper, r=nikic
llvm-wrapper: adapt for removal of the ASanGlobalsMetadataAnalysis LLVM API No functional changes intended. This adapts llvm-wrapper for llvm/llvm-project@dacfa24, which removed `ASanGlobalsMetadataAnalysis`. Found via our experimental rust + HEAD llvm bot: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/11565#0181a72f-75bb-4378-88f0-4c0bca7d03fa/231-505.
2 parents 62a787c + fe02ee8 commit db872ee

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,9 @@ LLVMRustOptimizeWithNewPassManager(
985985
if (SanitizerOptions->SanitizeAddress) {
986986
OptimizerLastEPCallbacks.push_back(
987987
[SanitizerOptions](ModulePassManager &MPM, OptimizationLevel Level) {
988+
#if LLVM_VERSION_LT(15, 0)
988989
MPM.addPass(RequireAnalysisPass<ASanGlobalsMetadataAnalysis, Module>());
990+
#endif
989991
#if LLVM_VERSION_GE(14, 0)
990992
AddressSanitizerOptions opts = AddressSanitizerOptions{
991993
/*CompileKernel=*/false,

0 commit comments

Comments
 (0)