diff options
| author | bors <bors@rust-lang.org> | 2024-03-12 16:31:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-12 16:31:43 +0000 |
| commit | 6b1e5d9db3b0d569bd847fdcb98c85ee8f7a8ef1 (patch) | |
| tree | 770d4252930ac33bf55dbcd829fc7c154f2f1490 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | 7de1a1f6db26cf7af43cca74819118428e6317ee (diff) | |
| parent | 3e9c1d7253ded5dde25b548076c53e359e203f77 (diff) | |
| download | rust-6b1e5d9db3b0d569bd847fdcb98c85ee8f7a8ef1.tar.gz rust-6b1e5d9db3b0d569bd847fdcb98c85ee8f7a8ef1.zip | |
Auto merge of #122389 - workingjubilee:rollup-vbdniap, r=workingjubilee
Rollup of 12 pull requests Successful merges: - #121754 ([bootstrap] Move the `split-debuginfo` setting to the per-target section) - #121953 (Add tests for the generated assembly of mask related simd instructions.) - #122081 (validate `builder::PATH_REMAP`) - #122245 (Detect truncated DepGraph files) - #122354 (bootstrap: Don't eagerly format verbose messages) - #122355 (rustdoc: fix up old test) - #122363 (tests: Add ui/attributes/unix_sigpipe/unix_sigpipe-str-list.rs) - #122366 (Fix stack overflow with recursive associated types) - #122377 (Fix discriminant_kind copy paste from the pointee trait case) - #122378 (Properly rebuild rustbooks) - #122380 (Fix typo in lib.rs of proc_macro) - #122381 (llvm-wrapper: adapt for LLVM API changes) 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 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index d76dea6f86c..1632b9e1249 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -1112,11 +1112,16 @@ extern "C" LLVMValueRef LLVMRustDIBuilderInsertDeclareAtEnd( LLVMRustDIBuilderRef Builder, LLVMValueRef V, LLVMMetadataRef VarInfo, uint64_t *AddrOps, unsigned AddrOpsCount, LLVMMetadataRef DL, LLVMBasicBlockRef InsertAtEnd) { - return wrap(Builder->insertDeclare( + auto Result = Builder->insertDeclare( unwrap(V), unwrap<DILocalVariable>(VarInfo), Builder->createExpression(llvm::ArrayRef<uint64_t>(AddrOps, AddrOpsCount)), DebugLoc(cast<MDNode>(unwrap(DL))), - unwrap(InsertAtEnd))); + unwrap(InsertAtEnd)); +#if LLVM_VERSION_GE(19, 0) + return wrap(Result.get<llvm::Instruction *>()); +#else + return wrap(Result); +#endif } extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateEnumerator( |