Skip to content

Commit 494cb3c

Browse files
authored
Rollup merge of #80990 - cuviper:unused-debug-context, r=nagisa
llvm: Remove the unused context from CreateDebugLocation This went unused in commit 88d874d, part of #68965.
2 parents c504e89 + 0342fd1 commit 494cb3c

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

compiler/rustc_codegen_llvm/src/debuginfo/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,6 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
552552

553553
unsafe {
554554
llvm::LLVMRustDIBuilderCreateDebugLocation(
555-
utils::debug_context(self).llcontext,
556555
line.unwrap_or(UNKNOWN_LINE_NUMBER),
557556
col.unwrap_or(UNKNOWN_COLUMN_NUMBER),
558557
scope,

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2102,7 +2102,6 @@ extern "C" {
21022102
);
21032103

21042104
pub fn LLVMRustDIBuilderCreateDebugLocation(
2105-
Context: &'a Context,
21062105
Line: c_uint,
21072106
Column: c_uint,
21082107
Scope: &'a DIScope,

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -994,11 +994,9 @@ LLVMRustDICompositeTypeReplaceArrays(LLVMRustDIBuilderRef Builder,
994994
}
995995

996996
extern "C" LLVMMetadataRef
997-
LLVMRustDIBuilderCreateDebugLocation(LLVMContextRef ContextRef, unsigned Line,
998-
unsigned Column, LLVMMetadataRef Scope,
997+
LLVMRustDIBuilderCreateDebugLocation(unsigned Line, unsigned Column,
998+
LLVMMetadataRef Scope,
999999
LLVMMetadataRef InlinedAt) {
1000-
LLVMContext &Context = *unwrap(ContextRef);
1001-
10021000
DebugLoc debug_loc = DebugLoc::get(Line, Column, unwrapDIPtr<MDNode>(Scope),
10031001
unwrapDIPtr<MDNode>(InlinedAt));
10041002

0 commit comments

Comments
 (0)