Skip to content

Commit 3e9c1d7

Browse files
Rollup merge of #122381 - krasimirgg:llvm-19-mar, r=durin42
llvm-wrapper: adapt for LLVM API changes Adapts rust for llvm/llvm-project@9997e03. `@rustbot` label: +llvm-main r? `@durin42`
2 parents 8efdef6 + 0a2ddcd commit 3e9c1d7

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -1112,11 +1112,16 @@ extern "C" LLVMValueRef LLVMRustDIBuilderInsertDeclareAtEnd(
11121112
LLVMRustDIBuilderRef Builder, LLVMValueRef V, LLVMMetadataRef VarInfo,
11131113
uint64_t *AddrOps, unsigned AddrOpsCount, LLVMMetadataRef DL,
11141114
LLVMBasicBlockRef InsertAtEnd) {
1115-
return wrap(Builder->insertDeclare(
1115+
auto Result = Builder->insertDeclare(
11161116
unwrap(V), unwrap<DILocalVariable>(VarInfo),
11171117
Builder->createExpression(llvm::ArrayRef<uint64_t>(AddrOps, AddrOpsCount)),
11181118
DebugLoc(cast<MDNode>(unwrap(DL))),
1119-
unwrap(InsertAtEnd)));
1119+
unwrap(InsertAtEnd));
1120+
#if LLVM_VERSION_GE(19, 0)
1121+
return wrap(Result.get<llvm::Instruction *>());
1122+
#else
1123+
return wrap(Result);
1124+
#endif
11201125
}
11211126

11221127
extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateEnumerator(

0 commit comments

Comments
 (0)