Skip to content

Commit 17e2c8a

Browse files
tautschnigtautschnig
committed
Update expected MIR in tests
Updated via `./x.py test mir-opt --bless --stage 1` plus a manual tweak of `tests/mir-opt/gvn_ptr_eq_with_constant.main.GVN.diff`.
1 parent 03c571f commit 17e2c8a

13 files changed

+233
-57
lines changed

‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-abort.diff‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,37 @@
1818
scope 5 (inlined NonNull::<[bool; 0]>::dangling) {
1919
let mut _6: std::num::NonZero<usize>;
2020
scope 6 {
21-
scope 8 (inlined std::ptr::Alignment::as_nonzero) {
21+
scope 12 (inlined std::ptr::Alignment::as_nonzero) {
22+
scope 13 {
23+
scope 14 {
24+
scope 15 {
25+
}
26+
}
27+
}
28+
scope 16 (inlined core::contracts::build_check_ensures::<NonZero<usize>, {closure@std::ptr::Alignment::as_nonzero::{closure#0}}>) {
29+
}
2230
}
23-
scope 9 (inlined NonNull::<[bool; 0]>::without_provenance) {
31+
scope 17 (inlined NonNull::<[bool; 0]>::without_provenance) {
2432
let _7: *const [bool; 0];
25-
scope 10 {
33+
scope 18 {
2634
}
27-
scope 11 (inlined NonZero::<usize>::get) {
35+
scope 19 (inlined NonZero::<usize>::get) {
2836
}
29-
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
30-
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
37+
scope 20 (inlined std::ptr::without_provenance::<[bool; 0]>) {
38+
scope 21 (inlined without_provenance_mut::<[bool; 0]>) {
3139
}
3240
}
3341
}
3442
}
3543
scope 7 (inlined std::ptr::Alignment::of::<[bool; 0]>) {
44+
scope 8 {
45+
scope 9 {
46+
scope 10 {
47+
}
48+
}
49+
}
50+
scope 11 (inlined core::contracts::build_check_ensures::<std::ptr::Alignment, {closure@std::ptr::Alignment::of<[bool; 0]>::{closure#0}}>) {
51+
}
3652
}
3753
}
3854
}

‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-unwind.diff‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,37 @@
1818
scope 5 (inlined NonNull::<[bool; 0]>::dangling) {
1919
let mut _6: std::num::NonZero<usize>;
2020
scope 6 {
21-
scope 8 (inlined std::ptr::Alignment::as_nonzero) {
21+
scope 12 (inlined std::ptr::Alignment::as_nonzero) {
22+
scope 13 {
23+
scope 14 {
24+
scope 15 {
25+
}
26+
}
27+
}
28+
scope 16 (inlined core::contracts::build_check_ensures::<NonZero<usize>, {closure@std::ptr::Alignment::as_nonzero::{closure#0}}>) {
29+
}
2230
}
23-
scope 9 (inlined NonNull::<[bool; 0]>::without_provenance) {
31+
scope 17 (inlined NonNull::<[bool; 0]>::without_provenance) {
2432
let _7: *const [bool; 0];
25-
scope 10 {
33+
scope 18 {
2634
}
27-
scope 11 (inlined NonZero::<usize>::get) {
35+
scope 19 (inlined NonZero::<usize>::get) {
2836
}
29-
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
30-
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
37+
scope 20 (inlined std::ptr::without_provenance::<[bool; 0]>) {
38+
scope 21 (inlined without_provenance_mut::<[bool; 0]>) {
3139
}
3240
}
3341
}
3442
}
3543
scope 7 (inlined std::ptr::Alignment::of::<[bool; 0]>) {
44+
scope 8 {
45+
scope 9 {
46+
scope 10 {
47+
}
48+
}
49+
}
50+
scope 11 (inlined core::contracts::build_check_ensures::<std::ptr::Alignment, {closure@std::ptr::Alignment::of<[bool; 0]>::{closure#0}}>) {
51+
}
3652
}
3753
}
3854
}

‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-abort.diff‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,37 @@
1818
scope 5 (inlined NonNull::<[bool; 0]>::dangling) {
1919
let mut _6: std::num::NonZero<usize>;
2020
scope 6 {
21-
scope 8 (inlined std::ptr::Alignment::as_nonzero) {
21+
scope 12 (inlined std::ptr::Alignment::as_nonzero) {
22+
scope 13 {
23+
scope 14 {
24+
scope 15 {
25+
}
26+
}
27+
}
28+
scope 16 (inlined core::contracts::build_check_ensures::<NonZero<usize>, {closure@std::ptr::Alignment::as_nonzero::{closure#0}}>) {
29+
}
2230
}
23-
scope 9 (inlined NonNull::<[bool; 0]>::without_provenance) {
31+
scope 17 (inlined NonNull::<[bool; 0]>::without_provenance) {
2432
let _7: *const [bool; 0];
25-
scope 10 {
33+
scope 18 {
2634
}
27-
scope 11 (inlined NonZero::<usize>::get) {
35+
scope 19 (inlined NonZero::<usize>::get) {
2836
}
29-
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
30-
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
37+
scope 20 (inlined std::ptr::without_provenance::<[bool; 0]>) {
38+
scope 21 (inlined without_provenance_mut::<[bool; 0]>) {
3139
}
3240
}
3341
}
3442
}
3543
scope 7 (inlined std::ptr::Alignment::of::<[bool; 0]>) {
44+
scope 8 {
45+
scope 9 {
46+
scope 10 {
47+
}
48+
}
49+
}
50+
scope 11 (inlined core::contracts::build_check_ensures::<std::ptr::Alignment, {closure@std::ptr::Alignment::of<[bool; 0]>::{closure#0}}>) {
51+
}
3652
}
3753
}
3854
}

‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-unwind.diff‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,37 @@
1818
scope 5 (inlined NonNull::<[bool; 0]>::dangling) {
1919
let mut _6: std::num::NonZero<usize>;
2020
scope 6 {
21-
scope 8 (inlined std::ptr::Alignment::as_nonzero) {
21+
scope 12 (inlined std::ptr::Alignment::as_nonzero) {
22+
scope 13 {
23+
scope 14 {
24+
scope 15 {
25+
}
26+
}
27+
}
28+
scope 16 (inlined core::contracts::build_check_ensures::<NonZero<usize>, {closure@std::ptr::Alignment::as_nonzero::{closure#0}}>) {
29+
}
2230
}
23-
scope 9 (inlined NonNull::<[bool; 0]>::without_provenance) {
31+
scope 17 (inlined NonNull::<[bool; 0]>::without_provenance) {
2432
let _7: *const [bool; 0];
25-
scope 10 {
33+
scope 18 {
2634
}
27-
scope 11 (inlined NonZero::<usize>::get) {
35+
scope 19 (inlined NonZero::<usize>::get) {
2836
}
29-
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
30-
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
37+
scope 20 (inlined std::ptr::without_provenance::<[bool; 0]>) {
38+
scope 21 (inlined without_provenance_mut::<[bool; 0]>) {
3139
}
3240
}
3341
}
3442
}
3543
scope 7 (inlined std::ptr::Alignment::of::<[bool; 0]>) {
44+
scope 8 {
45+
scope 9 {
46+
scope 10 {
47+
}
48+
}
49+
}
50+
scope 11 (inlined core::contracts::build_check_ensures::<std::ptr::Alignment, {closure@std::ptr::Alignment::of<[bool; 0]>::{closure#0}}>) {
51+
}
3652
}
3753
}
3854
}

‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-abort.diff‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,37 @@
1818
scope 5 (inlined NonNull::<[bool; 0]>::dangling) {
1919
let mut _6: std::num::NonZero<usize>;
2020
scope 6 {
21-
scope 8 (inlined std::ptr::Alignment::as_nonzero) {
21+
scope 12 (inlined std::ptr::Alignment::as_nonzero) {
22+
scope 13 {
23+
scope 14 {
24+
scope 15 {
25+
}
26+
}
27+
}
28+
scope 16 (inlined core::contracts::build_check_ensures::<NonZero<usize>, {closure@std::ptr::Alignment::as_nonzero::{closure#0}}>) {
29+
}
2230
}
23-
scope 9 (inlined NonNull::<[bool; 0]>::without_provenance) {
31+
scope 17 (inlined NonNull::<[bool; 0]>::without_provenance) {
2432
let _7: *const [bool; 0];
25-
scope 10 {
33+
scope 18 {
2634
}
27-
scope 11 (inlined NonZero::<usize>::get) {
35+
scope 19 (inlined NonZero::<usize>::get) {
2836
}
29-
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
30-
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
37+
scope 20 (inlined std::ptr::without_provenance::<[bool; 0]>) {
38+
scope 21 (inlined without_provenance_mut::<[bool; 0]>) {
3139
}
3240
}
3341
}
3442
}
3543
scope 7 (inlined std::ptr::Alignment::of::<[bool; 0]>) {
44+
scope 8 {
45+
scope 9 {
46+
scope 10 {
47+
}
48+
}
49+
}
50+
scope 11 (inlined core::contracts::build_check_ensures::<std::ptr::Alignment, {closure@std::ptr::Alignment::of<[bool; 0]>::{closure#0}}>) {
51+
}
3652
}
3753
}
3854
}

‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-unwind.diff‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,37 @@
1818
scope 5 (inlined NonNull::<[bool; 0]>::dangling) {
1919
let mut _6: std::num::NonZero<usize>;
2020
scope 6 {
21-
scope 8 (inlined std::ptr::Alignment::as_nonzero) {
21+
scope 12 (inlined std::ptr::Alignment::as_nonzero) {
22+
scope 13 {
23+
scope 14 {
24+
scope 15 {
25+
}
26+
}
27+
}
28+
scope 16 (inlined core::contracts::build_check_ensures::<NonZero<usize>, {closure@std::ptr::Alignment::as_nonzero::{closure#0}}>) {
29+
}
2230
}
23-
scope 9 (inlined NonNull::<[bool; 0]>::without_provenance) {
31+
scope 17 (inlined NonNull::<[bool; 0]>::without_provenance) {
2432
let _7: *const [bool; 0];
25-
scope 10 {
33+
scope 18 {
2634
}
27-
scope 11 (inlined NonZero::<usize>::get) {
35+
scope 19 (inlined NonZero::<usize>::get) {
2836
}
29-
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
30-
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
37+
scope 20 (inlined std::ptr::without_provenance::<[bool; 0]>) {
38+
scope 21 (inlined without_provenance_mut::<[bool; 0]>) {
3139
}
3240
}
3341
}
3442
}
3543
scope 7 (inlined std::ptr::Alignment::of::<[bool; 0]>) {
44+
scope 8 {
45+
scope 9 {
46+
scope 10 {
47+
}
48+
}
49+
}
50+
scope 11 (inlined core::contracts::build_check_ensures::<std::ptr::Alignment, {closure@std::ptr::Alignment::of<[bool; 0]>::{closure#0}}>) {
51+
}
3652
}
3753
}
3854
}

‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-abort.diff‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,37 @@
1818
scope 5 (inlined NonNull::<[bool; 0]>::dangling) {
1919
let mut _6: std::num::NonZero<usize>;
2020
scope 6 {
21-
scope 8 (inlined std::ptr::Alignment::as_nonzero) {
21+
scope 12 (inlined std::ptr::Alignment::as_nonzero) {
22+
scope 13 {
23+
scope 14 {
24+
scope 15 {
25+
}
26+
}
27+
}
28+
scope 16 (inlined core::contracts::build_check_ensures::<NonZero<usize>, {closure@std::ptr::Alignment::as_nonzero::{closure#0}}>) {
29+
}
2230
}
23-
scope 9 (inlined NonNull::<[bool; 0]>::without_provenance) {
31+
scope 17 (inlined NonNull::<[bool; 0]>::without_provenance) {
2432
let _7: *const [bool; 0];
25-
scope 10 {
33+
scope 18 {
2634
}
27-
scope 11 (inlined NonZero::<usize>::get) {
35+
scope 19 (inlined NonZero::<usize>::get) {
2836
}
29-
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
30-
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
37+
scope 20 (inlined std::ptr::without_provenance::<[bool; 0]>) {
38+
scope 21 (inlined without_provenance_mut::<[bool; 0]>) {
3139
}
3240
}
3341
}
3442
}
3543
scope 7 (inlined std::ptr::Alignment::of::<[bool; 0]>) {
44+
scope 8 {
45+
scope 9 {
46+
scope 10 {
47+
}
48+
}
49+
}
50+
scope 11 (inlined core::contracts::build_check_ensures::<std::ptr::Alignment, {closure@std::ptr::Alignment::of<[bool; 0]>::{closure#0}}>) {
51+
}
3652
}
3753
}
3854
}

‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-unwind.diff‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,37 @@
1818
scope 5 (inlined NonNull::<[bool; 0]>::dangling) {
1919
let mut _6: std::num::NonZero<usize>;
2020
scope 6 {
21-
scope 8 (inlined std::ptr::Alignment::as_nonzero) {
21+
scope 12 (inlined std::ptr::Alignment::as_nonzero) {
22+
scope 13 {
23+
scope 14 {
24+
scope 15 {
25+
}
26+
}
27+
}
28+
scope 16 (inlined core::contracts::build_check_ensures::<NonZero<usize>, {closure@std::ptr::Alignment::as_nonzero::{closure#0}}>) {
29+
}
2230
}
23-
scope 9 (inlined NonNull::<[bool; 0]>::without_provenance) {
31+
scope 17 (inlined NonNull::<[bool; 0]>::without_provenance) {
2432
let _7: *const [bool; 0];
25-
scope 10 {
33+
scope 18 {
2634
}
27-
scope 11 (inlined NonZero::<usize>::get) {
35+
scope 19 (inlined NonZero::<usize>::get) {
2836
}
29-
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
30-
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
37+
scope 20 (inlined std::ptr::without_provenance::<[bool; 0]>) {
38+
scope 21 (inlined without_provenance_mut::<[bool; 0]>) {
3139
}
3240
}
3341
}
3442
}
3543
scope 7 (inlined std::ptr::Alignment::of::<[bool; 0]>) {
44+
scope 8 {
45+
scope 9 {
46+
scope 10 {
47+
}
48+
}
49+
}
50+
scope 11 (inlined core::contracts::build_check_ensures::<std::ptr::Alignment, {closure@std::ptr::Alignment::of<[bool; 0]>::{closure#0}}>) {
51+
}
3652
}
3753
}
3854
}

0 commit comments

Comments
 (0)