Skip to content

Commit e0279b3

Browse files
jakoschikojakoschiko
committed
Bless test output
1 parent ec39e42 commit e0279b3

6 files changed

+180
-176
lines changed

‎src/test/mir-opt/issue_73223.main.PreCodegen.32bit.diff

+33-31
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,25 @@
1313
let mut _11: bool; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
1414
let mut _12: bool; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
1515
let mut _13: i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
16-
let mut _15: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
17-
let _16: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
18-
let mut _17: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
19-
let _18: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
20-
let mut _19: std::option::Option<std::fmt::Arguments>; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
16+
let mut _14: &core::panic::assert_info::BinaryAssertionStaticData; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
17+
let _15: &core::panic::assert_info::BinaryAssertionStaticData; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
18+
let mut _16: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
19+
let _17: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
20+
let mut _18: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
21+
let _19: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
22+
let mut _20: std::option::Option<std::fmt::Arguments>; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
2123
scope 1 {
2224
debug split => _1; // in scope 1 at $DIR/issue-73223.rs:2:9: 2:14
2325
let _4: std::option::Option<i32>; // in scope 1 at $DIR/issue-73223.rs:7:9: 7:14
2426
scope 3 {
2527
debug _prev => _4; // in scope 3 at $DIR/issue-73223.rs:7:9: 7:14
2628
let _9: &i32; // in scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
2729
let _10: &i32; // in scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
28-
let mut _20: &i32; // in scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
30+
let mut _22: &i32; // in scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
2931
scope 4 {
3032
debug left_val => _9; // in scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
3133
debug right_val => _10; // in scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
32-
let _14: core::panicking::AssertKind; // in scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
33-
scope 5 {
34-
debug kind => _14; // in scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
35-
}
34+
let mut _21: &core::panic::assert_info::BinaryAssertionStaticData; // in scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
3635
}
3736
}
3837
}
@@ -60,14 +59,14 @@
6059
StorageLive(_7); // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
6160
_7 = &_1; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
6261
StorageLive(_8); // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
63-
_20 = const main::promoted[0]; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
62+
_22 = const main::promoted[1]; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
6463
// ty::Const
6564
// + ty: &i32
66-
// + val: Unevaluated(main, [], Some(promoted[0]))
65+
// + val: Unevaluated(main, [], Some(promoted[1]))
6766
// mir::Constant
6867
// + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
69-
// + literal: Const { ty: &i32, val: Unevaluated(Unevaluated { def: WithOptConstParam { did: DefId(0:3 ~ issue_73223[2d0f]::main), const_param_did: None }, substs_: Some([]), promoted: Some(promoted[0]) }) }
70-
_8 = _20; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
68+
// + literal: Const { ty: &i32, val: Unevaluated(Unevaluated { def: WithOptConstParam { did: DefId(0:3 ~ issue_73223[2d0f]::main), const_param_did: None }, substs_: Some([]), promoted: Some(promoted[1]) }) }
69+
_8 = _22; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
7170
(_6.0: &i32) = move _7; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
7271
(_6.1: &i32) = move _8; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
7372
StorageDead(_8); // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
@@ -89,27 +88,30 @@
8988

9089
bb1: {
9190
StorageLive(_14); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
92-
discriminant(_14) = 0; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
93-
StorageLive(_15); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
94-
StorageLive(_16); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
95-
_16 = _9; // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
96-
_15 = _16; // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
97-
StorageLive(_17); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
98-
StorageLive(_18); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
99-
_18 = _10; // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
100-
_17 = _18; // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
101-
StorageLive(_19); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
102-
discriminant(_19) = 0; // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
103-
core::panicking::assert_failed::<i32, i32>(const core::panicking::AssertKind::Eq, move _15, move _17, move _19); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
91+
StorageLive(_15); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
92+
_21 = const main::promoted[0]; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
93+
// ty::Const
94+
// + ty: &core::panic::assert_info::BinaryAssertionStaticData
95+
// + val: Unevaluated(main, [], Some(promoted[0]))
10496
// mir::Constant
10597
// + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
106-
// + literal: Const { ty: for<'r, 's, 't0> fn(core::panicking::AssertKind, &'r i32, &'s i32, std::option::Option<std::fmt::Arguments<'t0>>) -> ! {core::panicking::assert_failed::<i32, i32>}, val: Value(Scalar(<ZST>)) }
107-
// ty::Const
108-
// + ty: core::panicking::AssertKind
109-
// + val: Value(Scalar(0x00))
98+
// + literal: Const { ty: &core::panic::assert_info::BinaryAssertionStaticData, val: Unevaluated(Unevaluated { def: WithOptConstParam { did: DefId(0:3 ~ issue_73223[2d0f]::main), const_param_did: None }, substs_: Some([]), promoted: Some(promoted[0]) }) }
99+
_15 = _21; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
100+
_14 = _15; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
101+
StorageLive(_16); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
102+
StorageLive(_17); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
103+
_17 = _9; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
104+
_16 = _17; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
105+
StorageLive(_18); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
106+
StorageLive(_19); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
107+
_19 = _10; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
108+
_18 = _19; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
109+
StorageLive(_20); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
110+
discriminant(_20) = 0; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
111+
core::panicking::assert_failed::<i32, i32>(move _14, move _16, move _18, move _20); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
110112
// mir::Constant
111113
// + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
112-
// + literal: Const { ty: core::panicking::AssertKind, val: Value(Scalar(0x00)) }
114+
// + literal: Const { ty: for<'r, 's, 't0> fn(&'static core::panic::assert_info::BinaryAssertionStaticData, &'r i32, &'s i32, std::option::Option<std::fmt::Arguments<'t0>>) -> ! {core::panicking::assert_failed::<i32, i32>}, val: Value(Scalar(<ZST>)) }
113115
}
114116

115117
bb2: {

‎src/test/mir-opt/issue_73223.main.PreCodegen.64bit.diff

+33-31
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,25 @@
1313
let mut _11: bool; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
1414
let mut _12: bool; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
1515
let mut _13: i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
16-
let mut _15: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
17-
let _16: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
18-
let mut _17: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
19-
let _18: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
20-
let mut _19: std::option::Option<std::fmt::Arguments>; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
16+
let mut _14: &core::panic::assert_info::BinaryAssertionStaticData; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
17+
let _15: &core::panic::assert_info::BinaryAssertionStaticData; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
18+
let mut _16: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
19+
let _17: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
20+
let mut _18: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
21+
let _19: &i32; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
22+
let mut _20: std::option::Option<std::fmt::Arguments>; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
2123
scope 1 {
2224
debug split => _1; // in scope 1 at $DIR/issue-73223.rs:2:9: 2:14
2325
let _4: std::option::Option<i32>; // in scope 1 at $DIR/issue-73223.rs:7:9: 7:14
2426
scope 3 {
2527
debug _prev => _4; // in scope 3 at $DIR/issue-73223.rs:7:9: 7:14
2628
let _9: &i32; // in scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
2729
let _10: &i32; // in scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
28-
let mut _20: &i32; // in scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
30+
let mut _22: &i32; // in scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
2931
scope 4 {
3032
debug left_val => _9; // in scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
3133
debug right_val => _10; // in scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
32-
let _14: core::panicking::AssertKind; // in scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
33-
scope 5 {
34-
debug kind => _14; // in scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
35-
}
34+
let mut _21: &core::panic::assert_info::BinaryAssertionStaticData; // in scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
3635
}
3736
}
3837
}
@@ -60,14 +59,14 @@
6059
StorageLive(_7); // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
6160
_7 = &_1; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
6261
StorageLive(_8); // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
63-
_20 = const main::promoted[0]; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
62+
_22 = const main::promoted[1]; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
6463
// ty::Const
6564
// + ty: &i32
66-
// + val: Unevaluated(main, [], Some(promoted[0]))
65+
// + val: Unevaluated(main, [], Some(promoted[1]))
6766
// mir::Constant
6867
// + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
69-
// + literal: Const { ty: &i32, val: Unevaluated(Unevaluated { def: WithOptConstParam { did: DefId(0:3 ~ issue_73223[2d0f]::main), const_param_did: None }, substs_: Some([]), promoted: Some(promoted[0]) }) }
70-
_8 = _20; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
68+
// + literal: Const { ty: &i32, val: Unevaluated(Unevaluated { def: WithOptConstParam { did: DefId(0:3 ~ issue_73223[2d0f]::main), const_param_did: None }, substs_: Some([]), promoted: Some(promoted[1]) }) }
69+
_8 = _22; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
7170
(_6.0: &i32) = move _7; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
7271
(_6.1: &i32) = move _8; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
7372
StorageDead(_8); // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
@@ -89,27 +88,30 @@
8988

9089
bb1: {
9190
StorageLive(_14); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
92-
discriminant(_14) = 0; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
93-
StorageLive(_15); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
94-
StorageLive(_16); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
95-
_16 = _9; // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
96-
_15 = _16; // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
97-
StorageLive(_17); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
98-
StorageLive(_18); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
99-
_18 = _10; // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
100-
_17 = _18; // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
101-
StorageLive(_19); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
102-
discriminant(_19) = 0; // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
103-
core::panicking::assert_failed::<i32, i32>(const core::panicking::AssertKind::Eq, move _15, move _17, move _19); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
91+
StorageLive(_15); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
92+
_21 = const main::promoted[0]; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
93+
// ty::Const
94+
// + ty: &core::panic::assert_info::BinaryAssertionStaticData
95+
// + val: Unevaluated(main, [], Some(promoted[0]))
10496
// mir::Constant
10597
// + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
106-
// + literal: Const { ty: for<'r, 's, 't0> fn(core::panicking::AssertKind, &'r i32, &'s i32, std::option::Option<std::fmt::Arguments<'t0>>) -> ! {core::panicking::assert_failed::<i32, i32>}, val: Value(Scalar(<ZST>)) }
107-
// ty::Const
108-
// + ty: core::panicking::AssertKind
109-
// + val: Value(Scalar(0x00))
98+
// + literal: Const { ty: &core::panic::assert_info::BinaryAssertionStaticData, val: Unevaluated(Unevaluated { def: WithOptConstParam { did: DefId(0:3 ~ issue_73223[2d0f]::main), const_param_did: None }, substs_: Some([]), promoted: Some(promoted[0]) }) }
99+
_15 = _21; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
100+
_14 = _15; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
101+
StorageLive(_16); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
102+
StorageLive(_17); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
103+
_17 = _9; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
104+
_16 = _17; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
105+
StorageLive(_18); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
106+
StorageLive(_19); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
107+
_19 = _10; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
108+
_18 = _19; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
109+
StorageLive(_20); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
110+
discriminant(_20) = 0; // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
111+
core::panicking::assert_failed::<i32, i32>(move _14, move _16, move _18, move _20); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
110112
// mir::Constant
111113
// + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
112-
// + literal: Const { ty: core::panicking::AssertKind, val: Value(Scalar(0x00)) }
114+
// + literal: Const { ty: for<'r, 's, 't0> fn(&'static core::panic::assert_info::BinaryAssertionStaticData, &'r i32, &'s i32, std::option::Option<std::fmt::Arguments<'t0>>) -> ! {core::panicking::assert_failed::<i32, i32>}, val: Value(Scalar(<ZST>)) }
113115
}
114116

115117
bb2: {

0 commit comments

Comments
 (0)