Skip to content

Commit b45fec3

Browse files
mammothbanemammothbane
committed
bless failing tests
1 parent 97c5d59 commit b45fec3

File tree

2 files changed

+70
-114
lines changed

2 files changed

+70
-114
lines changed

‎tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-abort.mir

+35-57
Original file line numberDiff line numberDiff line change
@@ -5,67 +5,48 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
55
let mut _0: &[u8];
66
scope 1 (inlined <Vec<u8> as Deref>::deref) {
77
debug self => _1;
8-
let mut _7: usize;
9-
scope 2 (inlined Vec::<u8>::as_ptr) {
8+
scope 2 (inlined Vec::<u8>::as_slice) {
109
debug self => _1;
11-
let mut _2: &alloc::raw_vec::RawVec<u8>;
12-
scope 3 (inlined alloc::raw_vec::RawVec::<u8>::ptr) {
13-
debug self => _2;
14-
let mut _3: &alloc::raw_vec::RawVecInner;
15-
scope 4 (inlined alloc::raw_vec::RawVecInner::ptr::<u8>) {
16-
debug self => _3;
17-
let mut _6: std::ptr::NonNull<u8>;
18-
scope 5 (inlined alloc::raw_vec::RawVecInner::non_null::<u8>) {
10+
let mut _6: usize;
11+
scope 3 (inlined Vec::<u8>::as_ptr) {
12+
debug self => _1;
13+
let mut _2: &alloc::raw_vec::RawVec<u8>;
14+
scope 4 (inlined alloc::raw_vec::RawVec::<u8>::ptr) {
15+
debug self => _2;
16+
let mut _3: &alloc::raw_vec::RawVecInner;
17+
scope 5 (inlined alloc::raw_vec::RawVecInner::ptr::<u8>) {
1918
debug self => _3;
2019
let mut _4: std::ptr::NonNull<u8>;
21-
scope 6 (inlined Unique::<u8>::cast::<u8>) {
20+
scope 6 (inlined Unique::<u8>::as_ptr) {
2221
debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _4;
2322
debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;
24-
scope 7 (inlined NonNull::<u8>::cast::<u8>) {
23+
scope 7 (inlined NonNull::<u8>::as_ptr) {
2524
debug self => _4;
26-
scope 8 (inlined NonNull::<u8>::as_ptr) {
27-
debug self => _4;
28-
let mut _5: *const u8;
29-
}
30-
}
31-
}
32-
scope 9 (inlined #[track_caller] <Unique<u8> as Into<NonNull<u8>>>::into) {
33-
debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _6;
34-
debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;
35-
scope 10 (inlined <NonNull<u8> as From<Unique<u8>>>::from) {
36-
debug ((unique: Unique<u8>).0: std::ptr::NonNull<u8>) => _6;
37-
debug ((unique: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;
38-
scope 11 (inlined Unique::<u8>::as_non_null_ptr) {
39-
debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _6;
40-
debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;
41-
}
25+
let mut _5: *const u8;
4226
}
4327
}
4428
}
45-
scope 12 (inlined NonNull::<u8>::as_ptr) {
46-
debug self => _6;
47-
}
4829
}
4930
}
50-
}
51-
scope 13 (inlined std::slice::from_raw_parts::<'_, u8>) {
52-
debug data => _5;
53-
debug len => _7;
54-
let _8: *const [u8];
55-
scope 14 (inlined core::ub_checks::check_language_ub) {
56-
scope 15 (inlined core::ub_checks::check_language_ub::runtime) {
57-
}
58-
}
59-
scope 16 (inlined std::mem::size_of::<u8>) {
60-
}
61-
scope 17 (inlined align_of::<u8>) {
62-
}
63-
scope 18 (inlined slice_from_raw_parts::<u8>) {
31+
scope 8 (inlined std::slice::from_raw_parts::<'_, u8>) {
6432
debug data => _5;
65-
debug len => _7;
66-
scope 19 (inlined std::ptr::from_raw_parts::<[u8], u8>) {
67-
debug data_pointer => _5;
68-
debug metadata => _7;
33+
debug len => _6;
34+
let _7: *const [u8];
35+
scope 9 (inlined core::ub_checks::check_language_ub) {
36+
scope 10 (inlined core::ub_checks::check_language_ub::runtime) {
37+
}
38+
}
39+
scope 11 (inlined std::mem::size_of::<u8>) {
40+
}
41+
scope 12 (inlined align_of::<u8>) {
42+
}
43+
scope 13 (inlined slice_from_raw_parts::<u8>) {
44+
debug data => _5;
45+
debug len => _6;
46+
scope 14 (inlined std::ptr::from_raw_parts::<[u8], u8>) {
47+
debug data_pointer => _5;
48+
debug metadata => _6;
49+
}
6950
}
7051
}
7152
}
@@ -76,22 +57,19 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
7657
_2 = &((*_1).0: alloc::raw_vec::RawVec<u8>);
7758
StorageLive(_3);
7859
_3 = &(((*_1).0: alloc::raw_vec::RawVec<u8>).0: alloc::raw_vec::RawVecInner);
79-
StorageLive(_6);
8060
StorageLive(_4);
8161
_4 = copy (((((*_1).0: alloc::raw_vec::RawVec<u8>).0: alloc::raw_vec::RawVecInner).0: std::ptr::Unique<u8>).0: std::ptr::NonNull<u8>);
8262
_5 = copy (_4.0: *const u8);
83-
_6 = NonNull::<u8> { pointer: copy _5 };
8463
StorageDead(_4);
85-
StorageDead(_6);
8664
StorageDead(_3);
8765
StorageDead(_2);
66+
StorageLive(_6);
67+
_6 = copy ((*_1).1: usize);
8868
StorageLive(_7);
89-
_7 = copy ((*_1).1: usize);
90-
StorageLive(_8);
91-
_8 = *const [u8] from (copy _5, copy _7);
92-
_0 = &(*_8);
93-
StorageDead(_8);
69+
_7 = *const [u8] from (copy _5, copy _6);
70+
_0 = &(*_7);
9471
StorageDead(_7);
72+
StorageDead(_6);
9573
return;
9674
}
9775
}

‎tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-unwind.mir

+35-57
Original file line numberDiff line numberDiff line change
@@ -5,67 +5,48 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
55
let mut _0: &[u8];
66
scope 1 (inlined <Vec<u8> as Deref>::deref) {
77
debug self => _1;
8-
let mut _7: usize;
9-
scope 2 (inlined Vec::<u8>::as_ptr) {
8+
scope 2 (inlined Vec::<u8>::as_slice) {
109
debug self => _1;
11-
let mut _2: &alloc::raw_vec::RawVec<u8>;
12-
scope 3 (inlined alloc::raw_vec::RawVec::<u8>::ptr) {
13-
debug self => _2;
14-
let mut _3: &alloc::raw_vec::RawVecInner;
15-
scope 4 (inlined alloc::raw_vec::RawVecInner::ptr::<u8>) {
16-
debug self => _3;
17-
let mut _6: std::ptr::NonNull<u8>;
18-
scope 5 (inlined alloc::raw_vec::RawVecInner::non_null::<u8>) {
10+
let mut _6: usize;
11+
scope 3 (inlined Vec::<u8>::as_ptr) {
12+
debug self => _1;
13+
let mut _2: &alloc::raw_vec::RawVec<u8>;
14+
scope 4 (inlined alloc::raw_vec::RawVec::<u8>::ptr) {
15+
debug self => _2;
16+
let mut _3: &alloc::raw_vec::RawVecInner;
17+
scope 5 (inlined alloc::raw_vec::RawVecInner::ptr::<u8>) {
1918
debug self => _3;
2019
let mut _4: std::ptr::NonNull<u8>;
21-
scope 6 (inlined Unique::<u8>::cast::<u8>) {
20+
scope 6 (inlined Unique::<u8>::as_ptr) {
2221
debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _4;
2322
debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;
24-
scope 7 (inlined NonNull::<u8>::cast::<u8>) {
23+
scope 7 (inlined NonNull::<u8>::as_ptr) {
2524
debug self => _4;
26-
scope 8 (inlined NonNull::<u8>::as_ptr) {
27-
debug self => _4;
28-
let mut _5: *const u8;
29-
}
30-
}
31-
}
32-
scope 9 (inlined #[track_caller] <Unique<u8> as Into<NonNull<u8>>>::into) {
33-
debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _6;
34-
debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;
35-
scope 10 (inlined <NonNull<u8> as From<Unique<u8>>>::from) {
36-
debug ((unique: Unique<u8>).0: std::ptr::NonNull<u8>) => _6;
37-
debug ((unique: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;
38-
scope 11 (inlined Unique::<u8>::as_non_null_ptr) {
39-
debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _6;
40-
debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;
41-
}
25+
let mut _5: *const u8;
4226
}
4327
}
4428
}
45-
scope 12 (inlined NonNull::<u8>::as_ptr) {
46-
debug self => _6;
47-
}
4829
}
4930
}
50-
}
51-
scope 13 (inlined std::slice::from_raw_parts::<'_, u8>) {
52-
debug data => _5;
53-
debug len => _7;
54-
let _8: *const [u8];
55-
scope 14 (inlined core::ub_checks::check_language_ub) {
56-
scope 15 (inlined core::ub_checks::check_language_ub::runtime) {
57-
}
58-
}
59-
scope 16 (inlined std::mem::size_of::<u8>) {
60-
}
61-
scope 17 (inlined align_of::<u8>) {
62-
}
63-
scope 18 (inlined slice_from_raw_parts::<u8>) {
31+
scope 8 (inlined std::slice::from_raw_parts::<'_, u8>) {
6432
debug data => _5;
65-
debug len => _7;
66-
scope 19 (inlined std::ptr::from_raw_parts::<[u8], u8>) {
67-
debug data_pointer => _5;
68-
debug metadata => _7;
33+
debug len => _6;
34+
let _7: *const [u8];
35+
scope 9 (inlined core::ub_checks::check_language_ub) {
36+
scope 10 (inlined core::ub_checks::check_language_ub::runtime) {
37+
}
38+
}
39+
scope 11 (inlined std::mem::size_of::<u8>) {
40+
}
41+
scope 12 (inlined align_of::<u8>) {
42+
}
43+
scope 13 (inlined slice_from_raw_parts::<u8>) {
44+
debug data => _5;
45+
debug len => _6;
46+
scope 14 (inlined std::ptr::from_raw_parts::<[u8], u8>) {
47+
debug data_pointer => _5;
48+
debug metadata => _6;
49+
}
6950
}
7051
}
7152
}
@@ -76,22 +57,19 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
7657
_2 = &((*_1).0: alloc::raw_vec::RawVec<u8>);
7758
StorageLive(_3);
7859
_3 = &(((*_1).0: alloc::raw_vec::RawVec<u8>).0: alloc::raw_vec::RawVecInner);
79-
StorageLive(_6);
8060
StorageLive(_4);
8161
_4 = copy (((((*_1).0: alloc::raw_vec::RawVec<u8>).0: alloc::raw_vec::RawVecInner).0: std::ptr::Unique<u8>).0: std::ptr::NonNull<u8>);
8262
_5 = copy (_4.0: *const u8);
83-
_6 = NonNull::<u8> { pointer: copy _5 };
8463
StorageDead(_4);
85-
StorageDead(_6);
8664
StorageDead(_3);
8765
StorageDead(_2);
66+
StorageLive(_6);
67+
_6 = copy ((*_1).1: usize);
8868
StorageLive(_7);
89-
_7 = copy ((*_1).1: usize);
90-
StorageLive(_8);
91-
_8 = *const [u8] from (copy _5, copy _7);
92-
_0 = &(*_8);
93-
StorageDead(_8);
69+
_7 = *const [u8] from (copy _5, copy _6);
70+
_0 = &(*_7);
9471
StorageDead(_7);
72+
StorageDead(_6);
9573
return;
9674
}
9775
}

0 commit comments

Comments
 (0)