diff options
| author | bors <bors@rust-lang.org> | 2022-12-11 23:36:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-11 23:36:15 +0000 |
| commit | ee6533d7408f1447c028025c883a34c904d25ba4 (patch) | |
| tree | 1edb59886180eb42468ce0c9b818dfeb6145207c /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | bdb07a8ec8e77aa10fb84fae1d4ff71c21180bb4 (diff) | |
| parent | 427ea68278099ef9bf7cd474f76bc6a519c9b3dc (diff) | |
| download | rust-ee6533d7408f1447c028025c883a34c904d25ba4.tar.gz rust-ee6533d7408f1447c028025c883a34c904d25ba4.zip | |
Auto merge of #105579 - matthiaskrgr:rollup-vw5dlqc, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #101648 (Better documentation for env::home_dir()'s broken behaviour) - #105283 (Don't call `diagnostic_hir_wf_check` query if we have infer variables) - #105369 (Detect spurious ; before assoc fn body) - #105472 (Make encode_info_for_trait_item use queries instead of accessing the HIR) - #105521 (separate heading from body) - #105555 (llvm-wrapper: adapt for LLVM API changes) - #105560 (Extend rustdoc hashtag prepended line test) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index 5831d4693f1..279b6991854 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -322,7 +322,13 @@ extern "C" LLVMAttributeRef LLVMRustCreateUWTableAttr(LLVMContextRef C, bool Asy } extern "C" LLVMAttributeRef LLVMRustCreateAllocSizeAttr(LLVMContextRef C, uint32_t ElementSizeArg) { - return wrap(Attribute::getWithAllocSizeArgs(*unwrap(C), ElementSizeArg, None)); + return wrap(Attribute::getWithAllocSizeArgs(*unwrap(C), ElementSizeArg, +#if LLVM_VERSION_LT(16, 0) + None +#else + std::nullopt +#endif + )); } #if LLVM_VERSION_GE(15, 0) @@ -717,7 +723,11 @@ static std::optional<DIFile::ChecksumKind> fromRust(LLVMRustChecksumKind Kind) { #endif switch (Kind) { case LLVMRustChecksumKind::None: +#if LLVM_VERSION_LT(16, 0) return None; +#else + return std::nullopt; +#endif case LLVMRustChecksumKind::MD5: return DIFile::ChecksumKind::CSK_MD5; case LLVMRustChecksumKind::SHA1: |