diff options
| author | Krasimir Georgiev <krasimir@google.com> | 2022-12-05 12:04:25 +0000 |
|---|---|---|
| committer | Krasimir Georgiev <krasimir@google.com> | 2022-12-06 18:25:33 +0000 |
| commit | 75aec4703dea7ef8e13924ccfa3a3d2e8c5c7cff (patch) | |
| tree | b6009609c24160b955b009272eab71f17a9e12f5 /compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | |
| parent | c372b1470109547e37dcc29ffd4723ac9f66f15d (diff) | |
| download | rust-75aec4703dea7ef8e13924ccfa3a3d2e8c5c7cff.tar.gz rust-75aec4703dea7ef8e13924ccfa3a3d2e8c5c7cff.zip | |
llvm-wrapper: adapt for and LLVM API change
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, |