user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

slightly less trivial blessings

Browse source 
some optimization is behaving slightly differently on box derefs after this change, but the difference is irrelevant
This commit is contained in:
beepster4096 2025-08-13 15:08:08 -07:00
parent 33cc7787bf
commit 1bd490113c
10 changed files with 176 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

119
tests/mir-opt/dont_reset_cast_kind_without_updating_operand.test.GVN.32bit.panic-abort.diff
View file

@ -8,14 +8,14 @@
let _3: std::boxed::Box<()>;
let mut _6: *const ();
let mut _8: *const [()];
let mut _9: std::boxed::Box<()>;
let mut _10: *const ();
let mut _23: usize;
let mut _9: *const ();
let mut _22: usize;
let mut _23: std::ptr::NonNull<()>;
scope 1 {
debug vp_ctx => _1;
let _4: *const ();
scope 2 {
debug slf => _10;
debug slf => _9;
let _5: *const [()];
scope 3 {
debug bytes => _5;
@ -33,21 +33,21 @@
}
}
scope 5 (inlined Box::<()>::new) {
let mut _10: usize;
let mut _11: usize;
let mut _12: usize;
let mut _13: *mut u8;
let mut _12: *mut u8;
scope 6 (inlined alloc::alloc::exchange_malloc) {
let _14: std::alloc::Layout;
let mut _15: std::result::Result<std::ptr::NonNull<[u8]>, std::alloc::AllocError>;
let mut _16: isize;
let mut _18: !;
let _13: std::alloc::Layout;
let mut _14: std::result::Result<std::ptr::NonNull<[u8]>, std::alloc::AllocError>;
let mut _15: isize;
let mut _17: !;
scope 7 {
let _17: std::ptr::NonNull<[u8]>;
let _16: std::ptr::NonNull<[u8]>;
scope 8 {
scope 11 (inlined NonNull::<[u8]>::as_mut_ptr) {
scope 12 (inlined NonNull::<[u8]>::as_non_null_ptr) {
scope 13 (inlined NonNull::<[u8]>::cast::<u8>) {
let mut _22: *mut [u8];
let mut _21: *mut [u8];
scope 14 (inlined NonNull::<[u8]>::as_ptr) {
}
}
@ -60,9 +60,9 @@
}
}
scope 9 (inlined #[track_caller] Layout::from_size_align_unchecked) {
let mut _19: bool;
let _20: ();
let mut _21: std::ptr::Alignment;
let mut _18: bool;
let _19: ();
let mut _20: std::ptr::Alignment;
}
}
}
@ -71,19 +71,19 @@
StorageLive(_1);
StorageLive(_2);
StorageLive(_3);
StorageLive(_10);
StorageLive(_11);
StorageLive(_12);
- _10 = SizeOf(());
- _11 = AlignOf(());
+ _10 = const 0_usize;
+ _11 = const 1_usize;
StorageLive(_13);
- _11 = SizeOf(());
- _12 = AlignOf(());
+ _11 = const 0_usize;
+ _12 = const 1_usize;
StorageLive(_14);
StorageLive(_15);
StorageLive(_16);
StorageLive(_17);
StorageLive(_19);
_19 = const false;
- switchInt(move _19) -> [0: bb6, otherwise: bb5];
StorageLive(_18);
_18 = const false;
- switchInt(move _18) -> [0: bb6, otherwise: bb5];
+ switchInt(const false) -> [0: bb6, otherwise: bb5];
}
@ -98,48 +98,47 @@
}
bb3: {
- _18 = handle_alloc_error(move _14) -> unwind unreachable;
+ _18 = handle_alloc_error(const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}) -> unwind unreachable;
- _17 = handle_alloc_error(move _13) -> unwind unreachable;
+ _17 = handle_alloc_error(const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}) -> unwind unreachable;
}
bb4: {
_17 = copy ((_15 as Ok).0: std::ptr::NonNull<[u8]>);
StorageLive(_22);
_22 = copy _17 as *mut [u8] (Transmute);
_13 = copy _22 as *mut u8 (PtrToPtr);
StorageDead(_22);
StorageDead(_15);
StorageDead(_17);
StorageDead(_16);
_16 = copy ((_14 as Ok).0: std::ptr::NonNull<[u8]>);
StorageLive(_21);
_21 = copy _16 as *mut [u8] (Transmute);
_12 = copy _21 as *mut u8 (PtrToPtr);
StorageDead(_21);
StorageDead(_14);
_3 = ShallowInitBox(copy _13, ());
StorageDead(_16);
StorageDead(_15);
StorageDead(_13);
_3 = ShallowInitBox(copy _12, ());
StorageDead(_12);
StorageDead(_11);
StorageDead(_10);
_2 = &_3;
_1 = copy _2;
StorageDead(_2);
StorageLive(_4);
- _9 = deref_copy _3;
+ _9 = copy _3;
_10 = copy ((_9.0: std::ptr::Unique<()>).0: std::ptr::NonNull<()>) as *const () (Transmute);
_4 = copy _10;
_23 = copy ((_3.0: std::ptr::Unique<()>).0: std::ptr::NonNull<()>);
_9 = copy _23 as *const () (Transmute);
_4 = copy _9;
- StorageLive(_5);
+ nop;
StorageLive(_6);
- _6 = copy _4;
+ _6 = copy _10;
StorageLive(_23);
_23 = const 1_usize;
- _5 = *const [()] from (copy _6, copy _23);
+ _5 = *const [()] from (copy _10, const 1_usize);
StorageDead(_23);
+ _6 = copy _9;
StorageLive(_22);
_22 = const 1_usize;
- _5 = *const [()] from (copy _6, copy _22);
+ _5 = *const [()] from (copy _9, const 1_usize);
StorageDead(_22);
StorageDead(_6);
StorageLive(_7);
StorageLive(_8);
_8 = copy _5;
- _7 = copy _8 as *mut () (PtrToPtr);
+ _7 = copy ((_9.0: std::ptr::Unique<()>).0: std::ptr::NonNull<()>) as *mut () (Transmute);
+ _7 = copy _23 as *mut () (Transmute);
StorageDead(_8);
StorageDead(_7);
- StorageDead(_5);
@ -149,26 +148,26 @@
}
bb5: {
- _20 = Layout::from_size_align_unchecked::precondition_check(copy _11, copy _12) -> [return: bb6, unwind unreachable];
+ _20 = Layout::from_size_align_unchecked::precondition_check(const 0_usize, const 1_usize) -> [return: bb6, unwind unreachable];
- _19 = Layout::from_size_align_unchecked::precondition_check(copy _10, copy _11) -> [return: bb6, unwind unreachable];
+ _19 = Layout::from_size_align_unchecked::precondition_check(const 0_usize, const 1_usize) -> [return: bb6, unwind unreachable];
}
bb6: {
StorageDead(_19);
StorageLive(_21);
- _21 = copy _12 as std::ptr::Alignment (Transmute);
- _14 = Layout { size: copy _11, align: move _21 };
+ _21 = const std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0);
+ _14 = const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }};
StorageDead(_21);
StorageLive(_15);
- _15 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], copy _14, const false) -> [return: bb7, unwind unreachable];
+ _15 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}, const false) -> [return: bb7, unwind unreachable];
StorageDead(_18);
StorageLive(_20);
- _20 = copy _11 as std::ptr::Alignment (Transmute);
- _13 = Layout { size: copy _10, align: move _20 };
+ _20 = const std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0);
+ _13 = const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }};
StorageDead(_20);
StorageLive(_14);
- _14 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], copy _13, const false) -> [return: bb7, unwind unreachable];
+ _14 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}, const false) -> [return: bb7, unwind unreachable];
}
bb7: {
_16 = discriminant(_15);
switchInt(move _16) -> [0: bb4, 1: bb3, otherwise: bb2];
_15 = discriminant(_14);
switchInt(move _15) -> [0: bb4, 1: bb3, otherwise: bb2];
}
+ }
+

29
tests/mir-opt/dont_reset_cast_kind_without_updating_operand.test.GVN.32bit.panic-unwind.diff
View file

@ -8,14 +8,14 @@
let _3: std::boxed::Box<()>;
let mut _6: *const ();
let mut _8: *const [()];
let mut _9: std::boxed::Box<()>;
let mut _10: *const ();
let mut _11: usize;
let mut _9: *const ();
let mut _10: usize;
let mut _11: std::ptr::NonNull<()>;
scope 1 {
debug vp_ctx => _1;
let _4: *const ();
scope 2 {
debug slf => _10;
debug slf => _9;
let _5: *const [()];
scope 3 {
debug bytes => _5;
@ -45,26 +45,25 @@
_1 = copy _2;
StorageDead(_2);
StorageLive(_4);
- _9 = deref_copy _3;
+ _9 = copy _3;
_10 = copy ((_9.0: std::ptr::Unique<()>).0: std::ptr::NonNull<()>) as *const () (Transmute);
_4 = copy _10;
_11 = copy ((_3.0: std::ptr::Unique<()>).0: std::ptr::NonNull<()>);
_9 = copy _11 as *const () (Transmute);
_4 = copy _9;
- StorageLive(_5);
+ nop;
StorageLive(_6);
- _6 = copy _4;
+ _6 = copy _10;
StorageLive(_11);
_11 = const 1_usize;
- _5 = *const [()] from (copy _6, copy _11);
+ _5 = *const [()] from (copy _10, const 1_usize);
StorageDead(_11);
+ _6 = copy _9;
StorageLive(_10);
_10 = const 1_usize;
- _5 = *const [()] from (copy _6, copy _10);
+ _5 = *const [()] from (copy _9, const 1_usize);
StorageDead(_10);
StorageDead(_6);
StorageLive(_7);
StorageLive(_8);
_8 = copy _5;
- _7 = copy _8 as *mut () (PtrToPtr);
+ _7 = copy ((_9.0: std::ptr::Unique<()>).0: std::ptr::NonNull<()>) as *mut () (Transmute);
+ _7 = copy _11 as *mut () (Transmute);
StorageDead(_8);
StorageDead(_7);
- StorageDead(_5);

119
tests/mir-opt/dont_reset_cast_kind_without_updating_operand.test.GVN.64bit.panic-abort.diff
View file

@ -8,14 +8,14 @@
let _3: std::boxed::Box<()>;
let mut _6: *const ();
let mut _8: *const [()];
let mut _9: std::boxed::Box<()>;
let mut _10: *const ();
let mut _23: usize;
let mut _9: *const ();
let mut _22: usize;
let mut _23: std::ptr::NonNull<()>;
scope 1 {
debug vp_ctx => _1;
let _4: *const ();
scope 2 {
debug slf => _10;
debug slf => _9;
let _5: *const [()];
scope 3 {
debug bytes => _5;
@ -33,21 +33,21 @@
}
}
scope 5 (inlined Box::<()>::new) {
let mut _10: usize;
let mut _11: usize;
let mut _12: usize;
let mut _13: *mut u8;
let mut _12: *mut u8;
scope 6 (inlined alloc::alloc::exchange_malloc) {
let _14: std::alloc::Layout;
let mut _15: std::result::Result<std::ptr::NonNull<[u8]>, std::alloc::AllocError>;
let mut _16: isize;
let mut _18: !;
let _13: std::alloc::Layout;
let mut _14: std::result::Result<std::ptr::NonNull<[u8]>, std::alloc::AllocError>;
let mut _15: isize;
let mut _17: !;
scope 7 {
let _17: std::ptr::NonNull<[u8]>;
let _16: std::ptr::NonNull<[u8]>;
scope 8 {
scope 11 (inlined NonNull::<[u8]>::as_mut_ptr) {
scope 12 (inlined NonNull::<[u8]>::as_non_null_ptr) {
scope 13 (inlined NonNull::<[u8]>::cast::<u8>) {
let mut _22: *mut [u8];
let mut _21: *mut [u8];
scope 14 (inlined NonNull::<[u8]>::as_ptr) {
}
}
@ -60,9 +60,9 @@
}
}
scope 9 (inlined #[track_caller] Layout::from_size_align_unchecked) {
let mut _19: bool;
let _20: ();
let mut _21: std::ptr::Alignment;
let mut _18: bool;
let _19: ();
let mut _20: std::ptr::Alignment;
}
}
}
@ -71,19 +71,19 @@
StorageLive(_1);
StorageLive(_2);
StorageLive(_3);
StorageLive(_10);
StorageLive(_11);
StorageLive(_12);
- _10 = SizeOf(());
- _11 = AlignOf(());
+ _10 = const 0_usize;
+ _11 = const 1_usize;
StorageLive(_13);
- _11 = SizeOf(());
- _12 = AlignOf(());
+ _11 = const 0_usize;
+ _12 = const 1_usize;
StorageLive(_14);
StorageLive(_15);
StorageLive(_16);
StorageLive(_17);
StorageLive(_19);
_19 = const false;
- switchInt(move _19) -> [0: bb6, otherwise: bb5];
StorageLive(_18);
_18 = const false;
- switchInt(move _18) -> [0: bb6, otherwise: bb5];
+ switchInt(const false) -> [0: bb6, otherwise: bb5];
}
@ -98,48 +98,47 @@
}
bb3: {
- _18 = handle_alloc_error(move _14) -> unwind unreachable;
+ _18 = handle_alloc_error(const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}) -> unwind unreachable;
- _17 = handle_alloc_error(move _13) -> unwind unreachable;
+ _17 = handle_alloc_error(const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}) -> unwind unreachable;
}
bb4: {
_17 = copy ((_15 as Ok).0: std::ptr::NonNull<[u8]>);
StorageLive(_22);
_22 = copy _17 as *mut [u8] (Transmute);
_13 = copy _22 as *mut u8 (PtrToPtr);
StorageDead(_22);
StorageDead(_15);
StorageDead(_17);
StorageDead(_16);
_16 = copy ((_14 as Ok).0: std::ptr::NonNull<[u8]>);
StorageLive(_21);
_21 = copy _16 as *mut [u8] (Transmute);
_12 = copy _21 as *mut u8 (PtrToPtr);
StorageDead(_21);
StorageDead(_14);
_3 = ShallowInitBox(copy _13, ());
StorageDead(_16);
StorageDead(_15);
StorageDead(_13);
_3 = ShallowInitBox(copy _12, ());
StorageDead(_12);
StorageDead(_11);
StorageDead(_10);
_2 = &_3;
_1 = copy _2;
StorageDead(_2);
StorageLive(_4);
- _9 = deref_copy _3;
+ _9 = copy _3;
_10 = copy ((_9.0: std::ptr::Unique<()>).0: std::ptr::NonNull<()>) as *const () (Transmute);
_4 = copy _10;
_23 = copy ((_3.0: std::ptr::Unique<()>).0: std::ptr::NonNull<()>);
_9 = copy _23 as *const () (Transmute);
_4 = copy _9;
- StorageLive(_5);
+ nop;
StorageLive(_6);
- _6 = copy _4;
+ _6 = copy _10;
StorageLive(_23);
_23 = const 1_usize;
- _5 = *const [()] from (copy _6, copy _23);
+ _5 = *const [()] from (copy _10, const 1_usize);
StorageDead(_23);
+ _6 = copy _9;
StorageLive(_22);
_22 = const 1_usize;
- _5 = *const [()] from (copy _6, copy _22);
+ _5 = *const [()] from (copy _9, const 1_usize);
StorageDead(_22);
StorageDead(_6);
StorageLive(_7);
StorageLive(_8);
_8 = copy _5;
- _7 = copy _8 as *mut () (PtrToPtr);
+ _7 = copy ((_9.0: std::ptr::Unique<()>).0: std::ptr::NonNull<()>) as *mut () (Transmute);
+ _7 = copy _23 as *mut () (Transmute);
StorageDead(_8);
StorageDead(_7);
- StorageDead(_5);
@ -149,26 +148,26 @@
}
bb5: {
- _20 = Layout::from_size_align_unchecked::precondition_check(copy _11, copy _12) -> [return: bb6, unwind unreachable];
+ _20 = Layout::from_size_align_unchecked::precondition_check(const 0_usize, const 1_usize) -> [return: bb6, unwind unreachable];
- _19 = Layout::from_size_align_unchecked::precondition_check(copy _10, copy _11) -> [return: bb6, unwind unreachable];
+ _19 = Layout::from_size_align_unchecked::precondition_check(const 0_usize, const 1_usize) -> [return: bb6, unwind unreachable];
}
bb6: {
StorageDead(_19);
StorageLive(_21);
- _21 = copy _12 as std::ptr::Alignment (Transmute);
- _14 = Layout { size: copy _11, align: move _21 };
+ _21 = const std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0);
+ _14 = const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }};
StorageDead(_21);
StorageLive(_15);
- _15 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], copy _14, const false) -> [return: bb7, unwind unreachable];
+ _15 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}, const false) -> [return: bb7, unwind unreachable];
StorageDead(_18);
StorageLive(_20);
- _20 = copy _11 as std::ptr::Alignment (Transmute);
- _13 = Layout { size: copy _10, align: move _20 };
+ _20 = const std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0);
+ _13 = const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }};
StorageDead(_20);
StorageLive(_14);
- _14 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], copy _13, const false) -> [return: bb7, unwind unreachable];
+ _14 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}, const false) -> [return: bb7, unwind unreachable];
}
bb7: {
_16 = discriminant(_15);
switchInt(move _16) -> [0: bb4, 1: bb3, otherwise: bb2];
_15 = discriminant(_14);
switchInt(move _15) -> [0: bb4, 1: bb3, otherwise: bb2];
}
+ }
+

29
tests/mir-opt/dont_reset_cast_kind_without_updating_operand.test.GVN.64bit.panic-unwind.diff
View file

@ -8,14 +8,14 @@
let _3: std::boxed::Box<()>;
let mut _6: *const ();
let mut _8: *const [()];
let mut _9: std::boxed::Box<()>;
let mut _10: *const ();
let mut _11: usize;
let mut _9: *const ();
let mut _10: usize;
let mut _11: std::ptr::NonNull<()>;
scope 1 {
debug vp_ctx => _1;
let _4: *const ();
scope 2 {
debug slf => _10;
debug slf => _9;
let _5: *const [()];
scope 3 {
debug bytes => _5;
@ -45,26 +45,25 @@
_1 = copy _2;
StorageDead(_2);
StorageLive(_4);
- _9 = deref_copy _3;
+ _9 = copy _3;
_10 = copy ((_9.0: std::ptr::Unique<()>).0: std::ptr::NonNull<()>) as *const () (Transmute);
_4 = copy _10;
_11 = copy ((_3.0: std::ptr::Unique<()>).0: std::ptr::NonNull<()>);
_9 = copy _11 as *const () (Transmute);
_4 = copy _9;
- StorageLive(_5);
+ nop;
StorageLive(_6);
- _6 = copy _4;
+ _6 = copy _10;
StorageLive(_11);
_11 = const 1_usize;
- _5 = *const [()] from (copy _6, copy _11);
+ _5 = *const [()] from (copy _10, const 1_usize);
StorageDead(_11);
+ _6 = copy _9;
StorageLive(_10);
_10 = const 1_usize;
- _5 = *const [()] from (copy _6, copy _10);
+ _5 = *const [()] from (copy _9, const 1_usize);
StorageDead(_10);
StorageDead(_6);
StorageLive(_7);
StorageLive(_8);
_8 = copy _5;
- _7 = copy _8 as *mut () (PtrToPtr);
+ _7 = copy ((_9.0: std::ptr::Unique<()>).0: std::ptr::NonNull<()>) as *mut () (Transmute);
+ _7 = copy _11 as *mut () (Transmute);
StorageDead(_8);
StorageDead(_7);
- StorageDead(_5);

10
tests/mir-opt/inline/dont_ice_on_generic_rust_call.call.Inline.panic-abort.diff
View file

@ -9,8 +9,8 @@
let mut _4: I;
+ scope 1 (inlined <Box<dyn FnMut<I, Output = ()>> as FnMut<I>>::call_mut) {
+ let mut _5: &mut dyn std::ops::FnMut<I, Output = ()>;
+ let mut _6: std::boxed::Box<dyn std::ops::FnMut<I, Output = ()>>;
+ let mut _7: *const dyn std::ops::FnMut<I, Output = ()>;
+ let mut _6: *const dyn std::ops::FnMut<I, Output = ()>;
+ let mut _7: std::ptr::NonNull<dyn std::ops::FnMut<I, Output = ()>>;
+ }
bb0: {
@ -22,9 +22,9 @@
+ StorageLive(_6);
+ StorageLive(_7);
+ StorageLive(_5);
+ _6 = copy (*_3);
+ _7 = copy ((_6.0: std::ptr::Unique<dyn std::ops::FnMut<I, Output = ()>>).0: std::ptr::NonNull<dyn std::ops::FnMut<I, Output = ()>>) as *const dyn std::ops::FnMut<I, Output = ()> (Transmute);
+ _5 = &mut (*_7);
+ _7 = copy (((*_3).0: std::ptr::Unique<dyn std::ops::FnMut<I, Output = ()>>).0: std::ptr::NonNull<dyn std::ops::FnMut<I, Output = ()>>);
+ _6 = copy _7 as *const dyn std::ops::FnMut<I, Output = ()> (Transmute);
+ _5 = &mut (*_6);
+ _0 = <dyn FnMut<I, Output = ()> as FnMut<I>>::call_mut(move _5, move _4) -> [return: bb2, unwind unreachable];
}

10
tests/mir-opt/inline/dont_ice_on_generic_rust_call.call.Inline.panic-unwind.diff
View file

@ -9,8 +9,8 @@
let mut _4: I;
+ scope 1 (inlined <Box<dyn FnMut<I, Output = ()>> as FnMut<I>>::call_mut) {
+ let mut _5: &mut dyn std::ops::FnMut<I, Output = ()>;
+ let mut _6: std::boxed::Box<dyn std::ops::FnMut<I, Output = ()>>;
+ let mut _7: *const dyn std::ops::FnMut<I, Output = ()>;
+ let mut _6: *const dyn std::ops::FnMut<I, Output = ()>;
+ let mut _7: std::ptr::NonNull<dyn std::ops::FnMut<I, Output = ()>>;
+ }
bb0: {
@ -22,9 +22,9 @@
+ StorageLive(_6);
+ StorageLive(_7);
+ StorageLive(_5);
+ _6 = copy (*_3);
+ _7 = copy ((_6.0: std::ptr::Unique<dyn std::ops::FnMut<I, Output = ()>>).0: std::ptr::NonNull<dyn std::ops::FnMut<I, Output = ()>>) as *const dyn std::ops::FnMut<I, Output = ()> (Transmute);
+ _5 = &mut (*_7);
+ _7 = copy (((*_3).0: std::ptr::Unique<dyn std::ops::FnMut<I, Output = ()>>).0: std::ptr::NonNull<dyn std::ops::FnMut<I, Output = ()>>);
+ _6 = copy _7 as *const dyn std::ops::FnMut<I, Output = ()> (Transmute);
+ _5 = &mut (*_6);
+ _0 = <dyn FnMut<I, Output = ()> as FnMut<I>>::call_mut(move _5, move _4) -> [return: bb4, unwind: bb2];
}

10
tests/mir-opt/inline/inline_box_fn.call.Inline.panic-abort.diff
View file

@ -9,8 +9,8 @@
let mut _4: (i32,);
+ scope 1 (inlined <Box<dyn Fn(i32)> as Fn<(i32,)>>::call) {
+ let mut _5: &dyn std::ops::Fn(i32);
+ let mut _6: std::boxed::Box<dyn std::ops::Fn(i32)>;
+ let mut _7: *const dyn std::ops::Fn(i32);
+ let mut _6: *const dyn std::ops::Fn(i32);
+ let mut _7: std::ptr::NonNull<dyn std::ops::Fn(i32)>;
+ }
bb0: {
@ -23,9 +23,9 @@
+ StorageLive(_6);
+ StorageLive(_7);
+ StorageLive(_5);
+ _6 = copy (*_3);
+ _7 = copy ((_6.0: std::ptr::Unique<dyn std::ops::Fn(i32)>).0: std::ptr::NonNull<dyn std::ops::Fn(i32)>) as *const dyn std::ops::Fn(i32) (Transmute);
+ _5 = &(*_7);
+ _7 = copy (((*_3).0: std::ptr::Unique<dyn std::ops::Fn(i32)>).0: std::ptr::NonNull<dyn std::ops::Fn(i32)>);
+ _6 = copy _7 as *const dyn std::ops::Fn(i32) (Transmute);
+ _5 = &(*_6);
+ _2 = <dyn Fn(i32) as Fn<(i32,)>>::call(move _5, move _4) -> [return: bb2, unwind unreachable];
}

10
tests/mir-opt/inline/inline_box_fn.call.Inline.panic-unwind.diff
View file

@ -9,8 +9,8 @@
let mut _4: (i32,);
+ scope 1 (inlined <Box<dyn Fn(i32)> as Fn<(i32,)>>::call) {
+ let mut _5: &dyn std::ops::Fn(i32);
+ let mut _6: std::boxed::Box<dyn std::ops::Fn(i32)>;
+ let mut _7: *const dyn std::ops::Fn(i32);
+ let mut _6: *const dyn std::ops::Fn(i32);
+ let mut _7: std::ptr::NonNull<dyn std::ops::Fn(i32)>;
+ }
bb0: {
@ -23,9 +23,9 @@
+ StorageLive(_6);
+ StorageLive(_7);
+ StorageLive(_5);
+ _6 = copy (*_3);
+ _7 = copy ((_6.0: std::ptr::Unique<dyn std::ops::Fn(i32)>).0: std::ptr::NonNull<dyn std::ops::Fn(i32)>) as *const dyn std::ops::Fn(i32) (Transmute);
+ _5 = &(*_7);
+ _7 = copy (((*_3).0: std::ptr::Unique<dyn std::ops::Fn(i32)>).0: std::ptr::NonNull<dyn std::ops::Fn(i32)>);
+ _6 = copy _7 as *const dyn std::ops::Fn(i32) (Transmute);
+ _5 = &(*_6);
+ _2 = <dyn Fn(i32) as Fn<(i32,)>>::call(move _5, move _4) -> [return: bb4, unwind: bb2];
}

10
tests/mir-opt/inline/issue_58867_inline_as_ref_as_mut.b.Inline.after.mir
View file

@ -8,8 +8,8 @@ fn b(_1: &mut Box<T>) -> &mut T {
let mut _4: &mut std::boxed::Box<T>;
scope 1 (inlined <Box<T> as AsMut<T>>::as_mut) {
debug self => _4;
let mut _5: std::boxed::Box<T>;
let mut _6: *const T;
let mut _5: *const T;
let mut _6: std::ptr::NonNull<T>;
}
bb0: {
@ -19,9 +19,9 @@ fn b(_1: &mut Box<T>) -> &mut T {
_4 = copy _1;
StorageLive(_5);
StorageLive(_6);
_5 = copy (*_4);
_6 = copy ((_5.0: std::ptr::Unique<T>).0: std::ptr::NonNull<T>) as *const T (Transmute);
_3 = &mut (*_6);
_6 = copy (((*_4).0: std::ptr::Unique<T>).0: std::ptr::NonNull<T>);
_5 = copy _6 as *const T (Transmute);
_3 = &mut (*_5);
StorageDead(_6);
StorageDead(_5);
_2 = copy _3;

10
tests/mir-opt/inline/issue_58867_inline_as_ref_as_mut.d.Inline.after.mir
View file

@ -7,8 +7,8 @@ fn d(_1: &Box<T>) -> &T {
let mut _3: &std::boxed::Box<T>;
scope 1 (inlined <Box<T> as AsRef<T>>::as_ref) {
debug self => _3;
let mut _4: std::boxed::Box<T>;
let mut _5: *const T;
let mut _4: *const T;
let mut _5: std::ptr::NonNull<T>;
}
bb0: {
@ -17,9 +17,9 @@ fn d(_1: &Box<T>) -> &T {
_3 = copy _1;
StorageLive(_4);
StorageLive(_5);
_4 = copy (*_3);
_5 = copy ((_4.0: std::ptr::Unique<T>).0: std::ptr::NonNull<T>) as *const T (Transmute);
_2 = &(*_5);
_5 = copy (((*_3).0: std::ptr::Unique<T>).0: std::ptr::NonNull<T>);
_4 = copy _5 as *const T (Transmute);
_2 = &(*_4);
StorageDead(_5);
StorageDead(_4);
_0 = copy _2;