diff options
| author | bors <bors@rust-lang.org> | 2022-11-26 12:11:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-26 12:11:32 +0000 |
| commit | 579c993b35a02dc439b74bba18b0a14f77911c95 (patch) | |
| tree | 96295864ecfb4bc5263a954f91f8ac4e2e6b3adb /compiler/rustc_llvm/llvm-wrapper | |
| parent | 8841bee954ecf0e6820c9990feb3a76cb04e7d96 (diff) | |
| parent | 1fe18a5dad0efde1d4dd31afd49fc60f21d3f993 (diff) | |
| download | rust-579c993b35a02dc439b74bba18b0a14f77911c95.tar.gz rust-579c993b35a02dc439b74bba18b0a14f77911c95.zip | |
Auto merge of #104935 - matthiaskrgr:rollup-nuca86l, r=matthiaskrgr
Rollup of 6 pull requests
Successful merges:
- #104121 (Refine `instruction_set` MIR inline rules)
- #104675 (Unsupported query error now specifies if its unsupported for local or external crate)
- #104839 (improve array_from_fn documenation)
- #104880 ([llvm-wrapper] adapt for LLVM API change)
- #104899 (rustdoc: remove no-op CSS `#help dt { display: block }`)
- #104906 (Remove AscribeUserTypeCx)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp index 5f02bb6c307..7f4d63eed8b 100644 --- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp @@ -627,7 +627,11 @@ LLVMRustOptimize( bool DebugPassManager = false; PassInstrumentationCallbacks PIC; +#if LLVM_VERSION_LT(16, 0) StandardInstrumentations SI(DebugPassManager); +#else + StandardInstrumentations SI(TheModule->getContext(), DebugPassManager); +#endif SI.registerCallbacks(PIC); if (LlvmSelfProfiler){ |