Skip to content

Commit a19edd6

Browse files
committed
Auto merge of #68802 - eddyb:debuginfo-there-can-only-be-one-arg, r=nagisa
rustc_codegen_ssa: don't treat inlined variables as debuginfo arguments. Fixes #67586 by limiting `ArgumentVariable` special-casing to `VarDebugInfo` entries that are in `OUTERMOST_SOURCE_SCOPE`, i.e. the function's own argument scope. That excludes `VarDebugInfo` from inlined callees, which can also point to the caller's argument locals. This is a snippet from the optimized MIR (including inlining) of the testcase: ```rust fn foo(_1: usize) -> usize { debug bar => _1; // in scope 0 at ./example.rs:2:12: 2:15 let mut _0: usize; // return place in scope 0 at ./example.rs:2:27: 2:32 scope 1 { debug x => _1; // in scope 1 at /rustc/9ed29b6ff6aa2e048b09c27af8f62ee3040bdb37/src/libcore/convert/mod.rs:106:26: 106:27 } ``` `scope 1` is from inlining the `identity` call, and `debug x => _1;` comes from the body of `core::convert::identity`, so they are now ignored for the purposes of determining the `ArgumentVariable` debuginfo associated to `_1`.
2 parents 07a34df + 80515f7 commit a19edd6

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

src/librustc_codegen_ssa/mir/debuginfo.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,8 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
307307
let var_ty = self.monomorphized_place_ty(place.as_ref());
308308
let var_kind = if self.mir.local_kind(place.local) == mir::LocalKind::Arg
309309
&& place.projection.is_empty()
310+
&& var.source_info.scope == mir::OUTERMOST_SOURCE_SCOPE
310311
{
311-
// FIXME(eddyb, #67586) take `var.source_info.scope` into
312-
// account to avoid using `ArgumentVariable` more than once
313-
// per argument local.
314-
315312
let arg_index = place.local.index() - 1;
316313

317314
// FIXME(eddyb) shouldn't `ArgumentVariable` indices be
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// run-pass
2+
// compile-flags: -Z mir-opt-level=2 -C opt-level=0 -C debuginfo=2
3+
4+
#[inline(never)]
5+
pub fn foo(bar: usize) -> usize {
6+
std::convert::identity(bar)
7+
}
8+
9+
fn main() {
10+
foo(0);
11+
}

0 commit comments

Comments
 (0)