diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-09-05 15:16:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-05 15:16:51 +0200 |
| commit | 6f31d002441bdd77c2fab06f6e704dc30147564b (patch) | |
| tree | 6fc7f4dc16d6bfbf92be399506ab2b834d02c695 /compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | |
| parent | 9381e5bf58db6c8fecdcf1ad9a5fb8efbfc4b5c3 (diff) | |
| parent | bdfa08a3459870e7abdd5442ac8e9d20e64cc288 (diff) | |
| download | rust-6f31d002441bdd77c2fab06f6e704dc30147564b.tar.gz rust-6f31d002441bdd77c2fab06f6e704dc30147564b.zip | |
Rollup merge of #115563 - krasimirgg:llvm-18-bitcodereader, r=nikic
llvm-wrapper: adapt for LLVM API change No functional changes intended. Adapts the wrapper for https://github.com/llvm/llvm-project/commit/bbe8cd13335300958b04db5318c31ff52714f96f. Found by our experimental rust + llvm @ HEAD CI: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/22055#018a6495-8dd9-41df-9381-5e7b0009ce0a/274-575
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp')
| -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 6af5c24c458..8f8f1d8c04f 100644 --- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp @@ -1202,7 +1202,11 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules, Ret->ModuleMap[module->identifier] = mem_buffer; +#if LLVM_VERSION_GE(18, 0) + if (Error Err = readModuleSummaryIndex(mem_buffer, Ret->Index)) { +#else if (Error Err = readModuleSummaryIndex(mem_buffer, Ret->Index, i)) { +#endif LLVMRustSetLastError(toString(std::move(Err)).c_str()); return nullptr; } |