nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove LLVMRustDIBuilderInsertDeclareAtEnd return value

Browse Source 
The return value changed from an Instruction to a DbgRecord in
LLVM 19. As we don't actually use the result, drop the return
value entirely to support both.
This commit is contained in:
Nikita Popov 2024-07-12 14:52:26 +02:00 committed by Nikita Popov
parent 776b0adaaf
commit 8dfd3a455d
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_codegen_llvm/src/llvm/ffi.rs
View File

@ -2057,7 +2057,7 @@ extern "C" {
AddrOpsCount: c_uint, AddrOpsCount: c_uint,
DL: &'a DILocation, DL: &'a DILocation,
InsertAtEnd: &'a BasicBlock, InsertAtEnd: &'a BasicBlock,
) -> &'a Value; );
pub fn LLVMRustDIBuilderCreateEnumerator<'a>( pub fn LLVMRustDIBuilderCreateEnumerator<'a>(
Builder: &DIBuilder<'a>, Builder: &DIBuilder<'a>,

17
compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
View File

@ -1137,20 +1137,15 @@ LLVMRustDIBuilderGetOrCreateArray(LLVMRustDIBuilderRef Builder,
Builder->getOrCreateArray(ArrayRef<Metadata *>(DataValue, Count)).get()); Builder->getOrCreateArray(ArrayRef<Metadata *>(DataValue, Count)).get());
} }
extern "C" LLVMValueRef LLVMRustDIBuilderInsertDeclareAtEnd( extern "C" void LLVMRustDIBuilderInsertDeclareAtEnd(
LLVMRustDIBuilderRef Builder, LLVMValueRef V, LLVMMetadataRef VarInfo, LLVMRustDIBuilderRef Builder, LLVMValueRef V, LLVMMetadataRef VarInfo,
uint64_t *AddrOps, unsigned AddrOpsCount, LLVMMetadataRef DL, uint64_t *AddrOps, unsigned AddrOpsCount, LLVMMetadataRef DL,
LLVMBasicBlockRef InsertAtEnd) { LLVMBasicBlockRef InsertAtEnd) {
auto Result = Builder->insertDeclare( Builder->insertDeclare(unwrap(V), unwrap<DILocalVariable>(VarInfo),
unwrap(V), unwrap<DILocalVariable>(VarInfo), Builder->createExpression(
Builder->createExpression( llvm::ArrayRef<uint64_t>(AddrOps, AddrOpsCount)),
llvm::ArrayRef<uint64_t>(AddrOps, AddrOpsCount)), DebugLoc(cast<MDNode>(unwrap(DL))),
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( extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateEnumerator(