diff options
| author | bors <bors@rust-lang.org> | 2024-09-24 12:07:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-24 12:07:48 +0000 |
| commit | 4cbfcf1b7f16245176488e581f57b39a7e32bc31 (patch) | |
| tree | 0eb4a925afbc7d0b0533e4e2f06894dc89e81bc8 /compiler/rustc_codegen_llvm/src/asm.rs | |
| parent | 11e760b7f4e4aaa11bf51a64d4bb7f1171f6e466 (diff) | |
| parent | d7ebf9e541d973efc1c43df0da7ceeb4ae612512 (diff) | |
| download | rust-4cbfcf1b7f16245176488e581f57b39a7e32bc31.tar.gz rust-4cbfcf1b7f16245176488e581f57b39a7e32bc31.zip | |
Auto merge of #130389 - Luv-Ray:LLVMMDNodeInContext2, r=nikic
llvm: replace some deprecated functions `LLVMMDStringInContext` and `LLVMMDNodeInContext` are deprecated, replace them with `LLVMMDStringInContext2` and `LLVMMDNodeInContext2`. Also replace `Value` with `Metadata` in some function signatures for better consistency.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/asm.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/asm.rs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_llvm/src/asm.rs b/compiler/rustc_codegen_llvm/src/asm.rs index fabe7e56b8f..7621f111fe2 100644 --- a/compiler/rustc_codegen_llvm/src/asm.rs +++ b/compiler/rustc_codegen_llvm/src/asm.rs @@ -504,10 +504,15 @@ pub(crate) fn inline_asm_call<'ll>( // due to the asm template string coming from a macro. LLVM will // default to the first srcloc for lines that don't have an // associated srcloc. - srcloc.push(bx.const_i32(0)); + srcloc.push(llvm::LLVMValueAsMetadata(bx.const_i32(0))); } - srcloc.extend(line_spans.iter().map(|span| bx.const_i32(span.lo().to_u32() as i32))); - let md = llvm::LLVMMDNodeInContext(bx.llcx, srcloc.as_ptr(), srcloc.len() as u32); + srcloc.extend( + line_spans + .iter() + .map(|span| llvm::LLVMValueAsMetadata(bx.const_i32(span.lo().to_u32() as i32))), + ); + let md = llvm::LLVMMDNodeInContext2(bx.llcx, srcloc.as_ptr(), srcloc.len()); + let md = llvm::LLVMMetadataAsValue(&bx.llcx, md); llvm::LLVMSetMetadata(call, kind, md); Some(call) |
