diff options
| author | bors <bors@rust-lang.org> | 2022-10-26 23:58:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-26 23:58:24 +0000 |
| commit | df57f7b438660071fd8e2c8b587b8e38e36b47bd (patch) | |
| tree | b7dbc4dd16c1501d13a5e3878261babda9e1ff58 /compiler/rustc_llvm/llvm-wrapper | |
| parent | 1898c34e923bad763e723c68dd9f23a09f9eb0fc (diff) | |
| parent | 132883e455dc212f9009656992c1733643de2b18 (diff) | |
| download | rust-df57f7b438660071fd8e2c8b587b8e38e36b47bd.tar.gz rust-df57f7b438660071fd8e2c8b587b8e38e36b47bd.zip | |
Auto merge of #103604 - JohnTitor:rollup-q4ns2gh, r=JohnTitor
Rollup of 10 pull requests Successful merges: - #103432 (rustdoc: don't mark Box<T> as Iterator, Read, etc) - #103526 (More dupe typos again) - #103537 (rustdoc: combine shared CSS between `.*-line-numbers`) - #103549 (llvm-16: Don't initialize removed legacy passes) - #103558 (Update cargo) - #103567 (ptr::eq: clarify that comparing dyn Trait is fragile) - #103579 (:arrow_up: rust-analyzer) - #103580 (Fix typo in docs for `guaranteed_ne`) - #103596 (thread::set_name: debug-assert that things went well) - #103598 (rustc_lexer::TokenKind improve docs) Failed merges: - #103585 (Migrate source line numbers CSS to CSS variables) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp index 879a3b660b4..18d37d95a83 100644 --- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp @@ -69,7 +69,9 @@ extern "C" void LLVMInitializePasses() { initializeAnalysis(Registry); initializeTransformUtils(Registry); initializeInstCombine(Registry); +#if LLVM_VERSION_LT(16, 0) initializeInstrumentation(Registry); +#endif initializeTarget(Registry); } |