diff options
| author | bors <bors@rust-lang.org> | 2022-12-07 00:32:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-07 00:32:57 +0000 |
| commit | d43674e2c9b1a7b134ef76378c30e822c75c9aa1 (patch) | |
| tree | adc30e8c94cb6bfbb6ca35288d6c6545ffc8f1c5 /compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | |
| parent | 023b5136b597053f76941b54eeae668219e6e18d (diff) | |
| parent | 62d5beed0f29c32147c7c91308d201b8940711b8 (diff) | |
| download | rust-d43674e2c9b1a7b134ef76378c30e822c75c9aa1.tar.gz rust-d43674e2c9b1a7b134ef76378c30e822c75c9aa1.zip | |
Auto merge of #105397 - matthiaskrgr:rollup-xv5imz8, r=matthiaskrgr
Rollup of 6 pull requests
Successful merges:
- #105298 (llvm-wrapper: adapt for an LLVM API change)
- #105358 (Add a test for #104260)
- #105380 (add const generics ping files things for me)
- #105382 (remove an excess `this`)
- #105388 (rustdoc: remove redundant CSS `.import-item .stab { font-size }`)
- #105390 (unstable-book: Add `ignore` to `abi_efiapi` example code)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp index 7f4d63eed8b..1a3d458c300 100644 --- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp @@ -205,7 +205,12 @@ enum class LLVMRustCodeModel { None, }; -static Optional<CodeModel::Model> fromRust(LLVMRustCodeModel Model) { +#if LLVM_VERSION_LT(16, 0) +static Optional<CodeModel::Model> +#else +static std::optional<CodeModel::Model> +#endif +fromRust(LLVMRustCodeModel Model) { switch (Model) { case LLVMRustCodeModel::Tiny: return CodeModel::Tiny; @@ -638,7 +643,11 @@ LLVMRustOptimize( LLVMSelfProfileInitializeCallbacks(PIC,LlvmSelfProfiler,BeforePassCallback,AfterPassCallback); } +#if LLVM_VERSION_LT(16, 0) Optional<PGOOptions> PGOOpt; +#else + std::optional<PGOOptions> PGOOpt; +#endif if (PGOGenPath) { assert(!PGOUsePath && !PGOSampleUsePath); PGOOpt = PGOOptions(PGOGenPath, "", "", PGOOptions::IRInstr, |