Skip to content

Commit 0eb4d46

Browse files
borsbors
authored
Auto merge of #37310 - vadimcn:drop-spans, r=michaelwoerister
Fix line stepping in debugger. Attribute drop code to block's closing brace, instead of the line where the allocation was done. Attribute function epilogues to function body's closing brace, rather than the function header. Fixes #37032 r? @michaelwoerister
2 parents b5f6d7e + 209fe0d commit 0eb4d46

File tree

3 files changed

+99
-3
lines changed

3 files changed

+99
-3
lines changed

‎src/librustc_mir/build/mod.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,9 @@ pub fn construct_fn<'a, 'gcx, 'tcx, A>(hir: Cx<'a, 'gcx, 'tcx>,
176176
unpack!(block = builder.in_scope(arg_extent, block, |builder| {
177177
builder.args_and_body(block, return_ty, &arguments, arg_extent, ast_block)
178178
}));
179-
180-
let source_info = builder.source_info(span);
179+
// Attribute epilogue to function's closing brace
180+
let fn_end = Span { lo: span.hi, ..span };
181+
let source_info = builder.source_info(fn_end);
181182
let return_block = builder.return_block();
182183
builder.cfg.terminate(block, source_info,
183184
TerminatorKind::Goto { target: return_block });

‎src/librustc_mir/build/scope.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -521,8 +521,12 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
521521
if let DropKind::Value { .. } = drop_kind {
522522
scope.needs_cleanup = true;
523523
}
524+
let tcx = self.hir.tcx();
525+
let extent_span = extent.span(&tcx.region_maps, &tcx.map).unwrap();
526+
// Attribute scope exit drops to scope's closing brace
527+
let scope_end = Span { lo: extent_span.hi, .. extent_span};
524528
scope.drops.push(DropData {
525-
span: span,
529+
span: scope_end,
526530
location: lvalue.clone(),
527531
kind: drop_kind
528532
});

‎src/test/debuginfo/drop-locations.rs

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
// Copyright 2013-2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// ignore-windows
12+
// ignore-android
13+
// min-lldb-version: 310
14+
15+
#![allow(unused)]
16+
17+
// compile-flags:-g
18+
19+
// This test checks that drop glue code gets attributed to scope's closing brace,
20+
// and function epilogues - to function's closing brace.
21+
22+
// === GDB TESTS ===================================================================================
23+
24+
// gdb-command:run
25+
// gdb-command:next
26+
// gdb-command:frame
27+
// gdb-check:[...]#loc1[...]
28+
// gdb-command:next
29+
// gdb-command:frame
30+
// gdb-check:[...]#loc2[...]
31+
// gdb-command:next
32+
// gdb-command:frame
33+
// gdb-check:[...]#loc3[...]
34+
// gdb-command:next
35+
// gdb-command:frame
36+
// gdb-check:[...]#loc4[...]
37+
// gdb-command:next
38+
// gdb-command:frame
39+
// gdb-check:[...]#loc5[...]
40+
// gdb-command:next
41+
// gdb-command:frame
42+
// gdb-check:[...]#loc6[...]
43+
44+
// === LLDB TESTS ==================================================================================
45+
46+
// lldb-command:set set stop-line-count-before 0
47+
// lldb-command:set set stop-line-count-after 1
48+
// Can't set both to zero or lldb will stop printing source at all. So it will output the current
49+
// line and the next. We deal with this by having at least 2 lines between the #loc's
50+
51+
// lldb-command:run
52+
// lldb-command:next
53+
// lldb-command:frame select
54+
// lldb-check:[...]#loc1[...]
55+
// lldb-command:next
56+
// lldb-command:frame select
57+
// lldb-check:[...]#loc2[...]
58+
// lldb-command:next
59+
// lldb-command:frame select
60+
// lldb-check:[...]#loc3[...]
61+
// lldb-command:next
62+
// lldb-command:frame select
63+
// lldb-check:[...]#loc4[...]
64+
// lldb-command:next
65+
// lldb-command:frame select
66+
// lldb-check:[...]#loc5[...]
67+
// lldb-command:next
68+
// lldb-command:frame select
69+
// lldb-check:[...]#loc6[...]
70+
71+
fn main() {
72+
73+
foo();
74+
75+
zzz(); // #loc5
76+
77+
} // #loc6
78+
79+
fn foo() {
80+
{
81+
let s = String::from("s"); // #break
82+
83+
zzz(); // #loc1
84+
85+
} // #loc2
86+
87+
zzz(); // #loc3
88+
89+
} // #loc4
90+
91+
fn zzz() {()}

0 commit comments

Comments
 (0)