Skip to content

Commit 4e8b642

Browse files
wesleywisercjgillot
wesleywiser
authored and
cjgillot
committed
Turn on ConstDebugInfo pass.
1 parent 4ad04ad commit 4e8b642

11 files changed

+69
-75
lines changed

‎compiler/rustc_mir_transform/src/const_debuginfo.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub struct ConstDebugInfo;
1616

1717
impl<'tcx> MirPass<'tcx> for ConstDebugInfo {
1818
fn is_enabled(&self, sess: &rustc_session::Session) -> bool {
19-
sess.opts.unstable_opts.unsound_mir_opts && sess.mir_opt_level() > 0
19+
sess.mir_opt_level() > 0
2020
}
2121

2222
fn run_pass(&self, _tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {

‎tests/codegen/debuginfo-constant-locals.rs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// compile-flags: -g -O
2+
3+
// Check that simple constant values are preserved in debuginfo across both MIR opts and LLVM opts
4+
5+
#![crate_type = "lib"]
6+
7+
#[no_mangle]
8+
pub fn check_it() {
9+
let a = 1;
10+
let b = 42;
11+
12+
foo(a + b);
13+
}
14+
15+
#[inline(never)]
16+
fn foo(x: i32) {
17+
std::process::exit(x);
18+
}
19+
20+
// CHECK-LABEL: @check_it
21+
// CHECK: call void @llvm.dbg.value(metadata i32 1, metadata ![[a_metadata:[0-9]+]], metadata !DIExpression())
22+
// CHECK: call void @llvm.dbg.value(metadata i32 42, metadata ![[b_metadata:[0-9]+]], metadata !DIExpression())
23+
24+
// CHECK: ![[a_metadata]] = !DILocalVariable(name: "a"
25+
// CHECK-SAME: line: 9
26+
27+
// CHECK: ![[b_metadata]] = !DILocalVariable(name: "b"
28+
// CHECK-SAME: line: 10

‎tests/incremental/hashes/enum_constructors.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,9 +334,9 @@ pub fn change_constructor_variant_c_like() {
334334
}
335335

336336
#[cfg(not(any(cfail1,cfail4)))]
337-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
337+
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
338338
#[rustc_clean(cfg="cfail3")]
339-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
339+
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir")]
340340
#[rustc_clean(cfg="cfail6")]
341341
pub fn change_constructor_variant_c_like() {
342342
let _x = Clike::C;

‎tests/incremental/hashes/let_expressions.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ pub fn change_mutability_of_slot() {
9191
}
9292

9393
#[cfg(not(any(cfail1,cfail4)))]
94-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck,optimized_mir")]
94+
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck")]
9595
#[rustc_clean(cfg="cfail3")]
9696
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,typeck,optimized_mir")]
9797
#[rustc_clean(cfg="cfail6")]
@@ -176,7 +176,7 @@ pub fn change_mutability_of_binding_in_pattern() {
176176
}
177177

178178
#[cfg(not(any(cfail1,cfail4)))]
179-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck,optimized_mir")]
179+
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck")]
180180
#[rustc_clean(cfg="cfail3")]
181181
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,typeck,optimized_mir")]
182182
#[rustc_clean(cfg="cfail6")]
@@ -193,9 +193,9 @@ pub fn add_initializer() {
193193
}
194194

195195
#[cfg(not(any(cfail1,cfail4)))]
196-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck")]
196+
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck,optimized_mir")]
197197
#[rustc_clean(cfg="cfail3")]
198-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,typeck")]
198+
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,typeck,optimized_mir")]
199199
#[rustc_clean(cfg="cfail6")]
200200
pub fn add_initializer() {
201201
let _x: i16 = 3i16;
@@ -210,9 +210,9 @@ pub fn change_initializer() {
210210
}
211211

212212
#[cfg(not(any(cfail1,cfail4)))]
213-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
213+
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
214214
#[rustc_clean(cfg="cfail3")]
215-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
215+
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes, optimized_mir")]
216216
#[rustc_clean(cfg="cfail6")]
217217
pub fn change_initializer() {
218218
let _x = 5u16;

‎tests/mir-opt/const_prop/optimizes_into_variable.main.PreCodegen.after.32bit.mir‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,17 @@
22

33
fn main() -> () {
44
let mut _0: (); // return place in scope 0 at $DIR/optimizes_into_variable.rs:+0:11: +0:11
5-
let _1: i32; // in scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
6-
let mut _3: u32; // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
75
scope 1 {
8-
debug x => _1; // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
9-
let _2: i32; // in scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
6+
debug x => const 4_i32; // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
107
scope 2 {
11-
debug y => _2; // in scope 2 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
8+
debug y => const 3_i32; // in scope 2 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
129
scope 3 {
13-
debug z => _3; // in scope 3 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
10+
debug z => const 42_u32; // in scope 3 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
1411
}
1512
}
1613
}
1714

1815
bb0: {
19-
StorageLive(_1); // scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
20-
StorageLive(_2); // scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
21-
StorageDead(_2); // scope 1 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
22-
StorageDead(_1); // scope 0 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
2316
return; // scope 0 at $DIR/optimizes_into_variable.rs:+4:2: +4:2
2417
}
2518
}

‎tests/mir-opt/const_prop/optimizes_into_variable.main.PreCodegen.after.64bit.mir‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,17 @@
22

33
fn main() -> () {
44
let mut _0: (); // return place in scope 0 at $DIR/optimizes_into_variable.rs:+0:11: +0:11
5-
let _1: i32; // in scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
6-
let mut _3: u32; // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
75
scope 1 {
8-
debug x => _1; // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
9-
let _2: i32; // in scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
6+
debug x => const 4_i32; // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
107
scope 2 {
11-
debug y => _2; // in scope 2 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
8+
debug y => const 3_i32; // in scope 2 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
129
scope 3 {
13-
debug z => _3; // in scope 3 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
10+
debug z => const 42_u32; // in scope 3 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
1411
}
1512
}
1613
}
1714

1815
bb0: {
19-
StorageLive(_1); // scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
20-
StorageLive(_2); // scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
21-
StorageDead(_2); // scope 1 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
22-
StorageDead(_1); // scope 0 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
2316
return; // scope 0 at $DIR/optimizes_into_variable.rs:+4:2: +4:2
2417
}
2518
}

‎tests/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals-final.after.32bit.mir‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,17 @@
22

33
fn main() -> () {
44
let mut _0: (); // return place in scope 0 at $DIR/optimizes_into_variable.rs:+0:11: +0:11
5-
let _1: i32; // in scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
6-
let mut _3: u32; // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
75
scope 1 {
8-
debug x => _1; // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
9-
let _2: i32; // in scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
6+
debug x => const 4_i32; // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
107
scope 2 {
11-
debug y => _2; // in scope 2 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
8+
debug y => const 3_i32; // in scope 2 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
129
scope 3 {
13-
debug z => _3; // in scope 3 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
10+
debug z => const 42_u32; // in scope 3 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
1411
}
1512
}
1613
}
1714

1815
bb0: {
19-
StorageLive(_1); // scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
20-
StorageLive(_2); // scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
21-
StorageDead(_2); // scope 1 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
22-
StorageDead(_1); // scope 0 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
2316
return; // scope 0 at $DIR/optimizes_into_variable.rs:+4:2: +4:2
2417
}
2518
}

‎tests/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals-final.after.64bit.mir‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,17 @@
22

33
fn main() -> () {
44
let mut _0: (); // return place in scope 0 at $DIR/optimizes_into_variable.rs:+0:11: +0:11
5-
let _1: i32; // in scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
6-
let mut _3: u32; // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
75
scope 1 {
8-
debug x => _1; // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
9-
let _2: i32; // in scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
6+
debug x => const 4_i32; // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
107
scope 2 {
11-
debug y => _2; // in scope 2 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
8+
debug y => const 3_i32; // in scope 2 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
129
scope 3 {
13-
debug z => _3; // in scope 3 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
10+
debug z => const 42_u32; // in scope 3 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
1411
}
1512
}
1613
}
1714

1815
bb0: {
19-
StorageLive(_1); // scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
20-
StorageLive(_2); // scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
21-
StorageDead(_2); // scope 1 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
22-
StorageDead(_1); // scope 0 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
2316
return; // scope 0 at $DIR/optimizes_into_variable.rs:+4:2: +4:2
2417
}
2518
}

‎tests/mir-opt/inline/issue_106141.outer.Inline.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
+ let mut _2: bool; // in scope 1 at $DIR/issue_106141.rs:14:8: 14:21
99
+ let mut _3: &[bool; 1]; // in scope 1 at $DIR/issue_106141.rs:12:18: 12:25
1010
+ scope 2 {
11-
+ debug buffer => _3; // in scope 2 at $DIR/issue_106141.rs:12:9: 12:15
11+
+ debug buffer => const _; // in scope 2 at $DIR/issue_106141.rs:12:9: 12:15
1212
+ scope 3 {
1313
+ debug index => _0; // in scope 3 at $DIR/issue_106141.rs:13:9: 13:14
1414
+ }

‎tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.mir‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,29 @@ fn num_to_digit(_1: char) -> u32 {
44
debug num => _1; // in scope 0 at $DIR/issue_59352.rs:+0:21: +0:24
55
let mut _0: u32; // return place in scope 0 at $DIR/issue_59352.rs:+0:35: +0:38
66
let mut _2: std::option::Option<u32>; // in scope 0 at $DIR/issue_59352.rs:+2:26: +2:41
7-
let mut _3: u32; // in scope 0 at $DIR/issue_59352.rs:+2:12: +2:23
87
scope 1 (inlined char::methods::<impl char>::is_digit) { // at $DIR/issue_59352.rs:15:12: 15:23
98
debug self => _1; // in scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
10-
debug radix => _3; // in scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
11-
let mut _4: &std::option::Option<u32>; // in scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
12-
let _5: std::option::Option<u32>; // in scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
9+
debug radix => const 8_u32; // in scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
10+
let mut _3: &std::option::Option<u32>; // in scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
11+
let _4: std::option::Option<u32>; // in scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
1312
scope 2 (inlined Option::<u32>::is_some) { // at $SRC_DIR/core/src/char/methods.rs:LL:COL
14-
debug self => _4; // in scope 2 at $SRC_DIR/core/src/option.rs:LL:COL
15-
let mut _6: isize; // in scope 2 at $SRC_DIR/core/src/option.rs:LL:COL
13+
debug self => _3; // in scope 2 at $SRC_DIR/core/src/option.rs:LL:COL
14+
let mut _5: isize; // in scope 2 at $SRC_DIR/core/src/option.rs:LL:COL
1615
}
1716
}
1817
scope 3 (inlined #[track_caller] Option::<u32>::unwrap) { // at $DIR/issue_59352.rs:15:42: 15:50
1918
debug self => _2; // in scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
20-
let mut _7: isize; // in scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
21-
let mut _8: !; // in scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
19+
let mut _6: isize; // in scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
20+
let mut _7: !; // in scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
2221
scope 4 {
2322
debug val => _0; // in scope 4 at $SRC_DIR/core/src/option.rs:LL:COL
2423
}
2524
}
2625

2726
bb0: {
28-
StorageLive(_3); // scope 0 at $DIR/issue_59352.rs:+2:12: +2:23
27+
StorageLive(_3); // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
2928
StorageLive(_4); // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
30-
StorageLive(_5); // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
31-
_5 = char::methods::<impl char>::to_digit(_1, const 8_u32) -> bb5; // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
29+
_4 = char::methods::<impl char>::to_digit(_1, const 8_u32) -> bb5; // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
3230
// mir::Constant
3331
// + span: $SRC_DIR/core/src/char/methods.rs:LL:COL
3432
// + literal: Const { ty: fn(char, u32) -> Option<u32> {char::methods::<impl char>::to_digit}, val: Value(<ZST>) }
@@ -43,8 +41,8 @@ fn num_to_digit(_1: char) -> u32 {
4341
}
4442

4543
bb2: {
46-
_7 = discriminant(_2); // scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
47-
switchInt(move _7) -> [0: bb6, 1: bb8, otherwise: bb7]; // scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
44+
_6 = discriminant(_2); // scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
45+
switchInt(move _6) -> [0: bb6, 1: bb8, otherwise: bb7]; // scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
4846
}
4947

5048
bb3: {
@@ -57,16 +55,15 @@ fn num_to_digit(_1: char) -> u32 {
5755
}
5856

5957
bb5: {
60-
_4 = &_5; // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
61-
_6 = discriminant((*_4)); // scope 2 at $SRC_DIR/core/src/option.rs:LL:COL
58+
_3 = &_4; // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
59+
_5 = discriminant((*_3)); // scope 2 at $SRC_DIR/core/src/option.rs:LL:COL
60+
StorageDead(_3); // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
6261
StorageDead(_4); // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
63-
StorageDead(_5); // scope 1 at $SRC_DIR/core/src/char/methods.rs:LL:COL
64-
StorageDead(_3); // scope 0 at $DIR/issue_59352.rs:+2:12: +2:23
65-
switchInt(move _6) -> [1: bb1, otherwise: bb3]; // scope 0 at $DIR/issue_59352.rs:+2:8: +2:23
62+
switchInt(move _5) -> [1: bb1, otherwise: bb3]; // scope 0 at $DIR/issue_59352.rs:+2:8: +2:23
6663
}
6764

6865
bb6: {
69-
_8 = core::panicking::panic(const "called `Option::unwrap()` on a `None` value"); // scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
66+
_7 = core::panicking::panic(const "called `Option::unwrap()` on a `None` value"); // scope 3 at $SRC_DIR/core/src/option.rs:LL:COL
7067
// mir::Constant
7168
// + span: $SRC_DIR/core/src/option.rs:LL:COL
7269
// + literal: Const { ty: fn(&'static str) -> ! {core::panicking::panic}, val: Value(<ZST>) }

0 commit comments

Comments
 (0)