mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark simplify_aggregate_to_copy mir-opt as unsound

Browse Source 
Co-authored-by: DianQK <dianqk@dianqk.net>
This commit is contained in:
许杰友 Jieyou Xu (Joe) 2024-10-30 21:11:37 +08:00
parent 4d8bda335e
commit 10b8ba4ecb
11 changed files with 63 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_mir_transform/src/gvn.rs
View File

@ -1082,7 +1082,9 @@ fn simplify_aggregate(
} }
} }
if let AggregateTy::Def(_, _) = ty // unsound: https://github.com/rust-lang/rust/issues/132353
if tcx.sess.opts.unstable_opts.unsound_mir_opts
&& let AggregateTy::Def(_, _) = ty
&& let Some(value) = && let Some(value) =
self.simplify_aggregate_to_copy(rvalue, location, &fields, variant_index) self.simplify_aggregate_to_copy(rvalue, location, &fields, variant_index)
{ {

2
tests/codegen/clone_as_copy.rs
View File

@ -1,4 +1,6 @@
//@ revisions: DEBUGINFO NODEBUGINFO //@ revisions: DEBUGINFO NODEBUGINFO
//@ compile-flags: -Zunsound-mir-opts
// FIXME: see <https://github.com/rust-lang/rust/issues/132353>
//@ compile-flags: -O -Cno-prepopulate-passes //@ compile-flags: -O -Cno-prepopulate-passes
//@ [DEBUGINFO] compile-flags: -Cdebuginfo=full //@ [DEBUGINFO] compile-flags: -Cdebuginfo=full

14
tests/codegen/try_question_mark_nop.rs
View File

@ -1,10 +1,7 @@
//@ compile-flags: -O -Z merge-functions=disabled --edition=2021 //@ compile-flags: -O -Z merge-functions=disabled --edition=2021
//@ only-x86_64 //@ only-x86_64
// FIXME: Remove the `min-llvm-version`. // FIXME: Remove the `min-llvm-version`.
//@ revisions: NINETEEN TWENTY //@ min-llvm-version: 19
//@[NINETEEN] min-llvm-version: 19
//@[NINETEEN] ignore-llvm-version: 20-99
//@[TWENTY] min-llvm-version: 20
#![crate_type = "lib"] #![crate_type = "lib"]
#![feature(try_blocks)] #![feature(try_blocks)]
@ -16,12 +13,9 @@
#[no_mangle] #[no_mangle]
pub fn option_nop_match_32(x: Option<u32>) -> Option<u32> { pub fn option_nop_match_32(x: Option<u32>) -> Option<u32> {
// CHECK: start: // CHECK: start:
// NINETEEN-NEXT: [[TRUNC:%.*]] = trunc nuw i32 %0 to i1 // CHECK-NEXT: [[REG1:%.*]] = insertvalue { i32, i32 } poison, i32 %0, 0
// NINETEEN-NEXT: [[FIRST:%.*]] = select i1 [[TRUNC]], i32 %0 // CHECK-NEXT: [[REG2:%.*]] = insertvalue { i32, i32 } [[REG1]], i32 %1, 1
// NINETEEN-NEXT: insertvalue { i32, i32 } poison, i32 [[FIRST]], 0 // CHECK-NEXT: ret { i32, i32 } [[REG2]]
// TWENTY-NEXT: insertvalue { i32, i32 } poison, i32 %0, 0
// CHECK-NEXT: insertvalue { i32, i32 }
// CHECK-NEXT: ret { i32, i32 }
match x { match x {
Some(x) => Some(x), Some(x) => Some(x),
None => None, None => None,

2
tests/mir-opt/gvn_clone.rs
View File

@ -1,3 +1,5 @@
//@ compile-flags: -Zunsound-mir-opts
// FIXME: see <https://github.com/rust-lang/rust/issues/132353>
//@ test-mir-pass: GVN //@ test-mir-pass: GVN
//@ compile-flags: -Zmir-enable-passes=+InstSimplify-before-inline //@ compile-flags: -Zmir-enable-passes=+InstSimplify-before-inline

6
tests/mir-opt/gvn_clone.{impl#0}-clone.GVN.diff
View File

@ -1,7 +1,7 @@
- // MIR for `<impl at $DIR/gvn_clone.rs:12:10: 12:15>::clone` before GVN - // MIR for `<impl at $DIR/gvn_clone.rs:14:10: 14:15>::clone` before GVN
+ // MIR for `<impl at $DIR/gvn_clone.rs:12:10: 12:15>::clone` after GVN + // MIR for `<impl at $DIR/gvn_clone.rs:14:10: 14:15>::clone` after GVN
fn <impl at $DIR/gvn_clone.rs:12:10: 12:15>::clone(_1: &AllCopy) -> AllCopy { fn <impl at $DIR/gvn_clone.rs:14:10: 14:15>::clone(_1: &AllCopy) -> AllCopy {
debug self => _1; debug self => _1;
let mut _0: AllCopy; let mut _0: AllCopy;
let mut _2: i32; let mut _2: i32;

2
tests/mir-opt/gvn_copy_aggregate.rs
View File

@ -1,3 +1,5 @@
//@ compile-flags: -Zunsound-mir-opts
// FIXME: see <https://github.com/rust-lang/rust/issues/132353.
//@ test-mir-pass: GVN //@ test-mir-pass: GVN
//@ compile-flags: -Cpanic=abort //@ compile-flags: -Cpanic=abort

2
tests/mir-opt/pre-codegen/clone_as_copy.rs
View File

@ -1,3 +1,5 @@
//@ compile-flags: -Zunsound-mir-opts
// FIXME: see <https://github.com/rust-lang/rust/issues/132353>
//@ compile-flags: -Cdebuginfo=full //@ compile-flags: -Cdebuginfo=full
// Check if we have transformed the nested clone to the copy in the complete pipeline. // Check if we have transformed the nested clone to the copy in the complete pipeline.

6
tests/mir-opt/pre-codegen/no_inlined_clone.{impl#0}-clone.PreCodegen.after.mir
View File

@ -3,9 +3,13 @@
fn <impl at $DIR/no_inlined_clone.rs:9:10: 9:15>::clone(_1: &Foo) -> Foo { fn <impl at $DIR/no_inlined_clone.rs:9:10: 9:15>::clone(_1: &Foo) -> Foo {
debug self => _1; debug self => _1;
let mut _0: Foo; let mut _0: Foo;
let mut _2: i32;
bb0: { bb0: {
_0 = copy (*_1); StorageLive(_2);
_2 = copy ((*_1).0: i32);
_0 = Foo { a: move _2 };
StorageDead(_2);
return; return;
} }
} }

8
tests/mir-opt/pre-codegen/try_identity.old.PreCodegen.after.mir
View File

@ -19,14 +19,14 @@ fn old(_1: Result<T, E>) -> Result<T, E> {
} }
bb1: { bb1: {
_3 = copy ((_1 as Ok).0: T); _3 = move ((_1 as Ok).0: T);
_0 = copy _1; _0 = Result::<T, E>::Ok(copy _3);
goto -> bb3; goto -> bb3;
} }
bb2: { bb2: {
_4 = copy ((_1 as Err).0: E); _4 = move ((_1 as Err).0: E);
_0 = copy _1; _0 = Result::<T, E>::Err(copy _4);
goto -> bb3; goto -> bb3;
} }

30
tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-abort.mir
View File

@ -7,7 +7,7 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
debug self => _1; debug self => _1;
scope 2 (inlined Vec::<u8>::as_slice) { scope 2 (inlined Vec::<u8>::as_slice) {
debug self => _1; debug self => _1;
let mut _6: usize; let mut _7: usize;
scope 3 (inlined Vec::<u8>::as_ptr) { scope 3 (inlined Vec::<u8>::as_ptr) {
debug self => _1; debug self => _1;
let mut _2: &alloc::raw_vec::RawVec<u8>; let mut _2: &alloc::raw_vec::RawVec<u8>;
@ -16,6 +16,7 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
let mut _3: &alloc::raw_vec::RawVecInner; let mut _3: &alloc::raw_vec::RawVecInner;
scope 5 (inlined alloc::raw_vec::RawVecInner::ptr::<u8>) { scope 5 (inlined alloc::raw_vec::RawVecInner::ptr::<u8>) {
debug self => _3; debug self => _3;
let mut _6: std::ptr::NonNull<u8>;
scope 6 (inlined alloc::raw_vec::RawVecInner::non_null::<u8>) { scope 6 (inlined alloc::raw_vec::RawVecInner::non_null::<u8>) {
debug self => _3; debug self => _3;
let mut _4: std::ptr::NonNull<u8>; let mut _4: std::ptr::NonNull<u8>;
@ -31,20 +32,20 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
} }
} }
scope 10 (inlined Unique::<u8>::as_non_null_ptr) { scope 10 (inlined Unique::<u8>::as_non_null_ptr) {
debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _4; debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _6;
debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>; debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;
} }
} }
scope 11 (inlined NonNull::<u8>::as_ptr) { scope 11 (inlined NonNull::<u8>::as_ptr) {
debug self => _4; debug self => _6;
} }
} }
} }
} }
scope 12 (inlined std::slice::from_raw_parts::<'_, u8>) { scope 12 (inlined std::slice::from_raw_parts::<'_, u8>) {
debug data => _5; debug data => _5;
debug len => _6; debug len => _7;
let _7: *const [u8]; let _8: *const [u8];
scope 13 (inlined core::ub_checks::check_language_ub) { scope 13 (inlined core::ub_checks::check_language_ub) {
scope 14 (inlined core::ub_checks::check_language_ub::runtime) { scope 14 (inlined core::ub_checks::check_language_ub::runtime) {
} }
@ -55,10 +56,10 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
} }
scope 17 (inlined slice_from_raw_parts::<u8>) { scope 17 (inlined slice_from_raw_parts::<u8>) {
debug data => _5; debug data => _5;
debug len => _6; debug len => _7;
scope 18 (inlined std::ptr::from_raw_parts::<[u8], u8>) { scope 18 (inlined std::ptr::from_raw_parts::<[u8], u8>) {
debug data_pointer => _5; debug data_pointer => _5;
debug metadata => _6; debug metadata => _7;
} }
} }
} }
@ -70,17 +71,22 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
_2 = &((*_1).0: alloc::raw_vec::RawVec<u8>); _2 = &((*_1).0: alloc::raw_vec::RawVec<u8>);
StorageLive(_3); StorageLive(_3);
_3 = &(((*_1).0: alloc::raw_vec::RawVec<u8>).0: alloc::raw_vec::RawVecInner); _3 = &(((*_1).0: alloc::raw_vec::RawVec<u8>).0: alloc::raw_vec::RawVecInner);
StorageLive(_6);
StorageLive(_4);
_4 = copy (((((*_1).0: alloc::raw_vec::RawVec<u8>).0: alloc::raw_vec::RawVecInner).0: std::ptr::Unique<u8>).0: std::ptr::NonNull<u8>); _4 = copy (((((*_1).0: alloc::raw_vec::RawVec<u8>).0: alloc::raw_vec::RawVecInner).0: std::ptr::Unique<u8>).0: std::ptr::NonNull<u8>);
_5 = copy (_4.0: *const u8); _5 = copy (_4.0: *const u8);
_6 = NonNull::<u8> { pointer: copy _5 };
StorageDead(_4);
StorageDead(_6);
StorageDead(_3); StorageDead(_3);
StorageDead(_2); StorageDead(_2);
StorageLive(_6);
_6 = copy ((*_1).1: usize);
StorageLive(_7); StorageLive(_7);
_7 = *const [u8] from (copy _5, copy _6); _7 = copy ((*_1).1: usize);
_0 = &(*_7); StorageLive(_8);
_8 = *const [u8] from (copy _5, copy _7);
_0 = &(*_8);
StorageDead(_8);
StorageDead(_7); StorageDead(_7);
StorageDead(_6);
return; return;
} }
} }

30
tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-unwind.mir
View File

@ -7,7 +7,7 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
debug self => _1; debug self => _1;
scope 2 (inlined Vec::<u8>::as_slice) { scope 2 (inlined Vec::<u8>::as_slice) {
debug self => _1; debug self => _1;
let mut _6: usize; let mut _7: usize;
scope 3 (inlined Vec::<u8>::as_ptr) { scope 3 (inlined Vec::<u8>::as_ptr) {
debug self => _1; debug self => _1;
let mut _2: &alloc::raw_vec::RawVec<u8>; let mut _2: &alloc::raw_vec::RawVec<u8>;
@ -16,6 +16,7 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
let mut _3: &alloc::raw_vec::RawVecInner; let mut _3: &alloc::raw_vec::RawVecInner;
scope 5 (inlined alloc::raw_vec::RawVecInner::ptr::<u8>) { scope 5 (inlined alloc::raw_vec::RawVecInner::ptr::<u8>) {
debug self => _3; debug self => _3;
let mut _6: std::ptr::NonNull<u8>;
scope 6 (inlined alloc::raw_vec::RawVecInner::non_null::<u8>) { scope 6 (inlined alloc::raw_vec::RawVecInner::non_null::<u8>) {
debug self => _3; debug self => _3;
let mut _4: std::ptr::NonNull<u8>; let mut _4: std::ptr::NonNull<u8>;
@ -31,20 +32,20 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
} }
} }
scope 10 (inlined Unique::<u8>::as_non_null_ptr) { scope 10 (inlined Unique::<u8>::as_non_null_ptr) {
debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _4; debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _6;
debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>; debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;
} }
} }
scope 11 (inlined NonNull::<u8>::as_ptr) { scope 11 (inlined NonNull::<u8>::as_ptr) {
debug self => _4; debug self => _6;
} }
} }
} }
} }
scope 12 (inlined std::slice::from_raw_parts::<'_, u8>) { scope 12 (inlined std::slice::from_raw_parts::<'_, u8>) {
debug data => _5; debug data => _5;
debug len => _6; debug len => _7;
let _7: *const [u8]; let _8: *const [u8];
scope 13 (inlined core::ub_checks::check_language_ub) { scope 13 (inlined core::ub_checks::check_language_ub) {
scope 14 (inlined core::ub_checks::check_language_ub::runtime) { scope 14 (inlined core::ub_checks::check_language_ub::runtime) {
} }
@ -55,10 +56,10 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
} }
scope 17 (inlined slice_from_raw_parts::<u8>) { scope 17 (inlined slice_from_raw_parts::<u8>) {
debug data => _5; debug data => _5;
debug len => _6; debug len => _7;
scope 18 (inlined std::ptr::from_raw_parts::<[u8], u8>) { scope 18 (inlined std::ptr::from_raw_parts::<[u8], u8>) {
debug data_pointer => _5; debug data_pointer => _5;
debug metadata => _6; debug metadata => _7;
} }
} }
} }
@ -70,17 +71,22 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
_2 = &((*_1).0: alloc::raw_vec::RawVec<u8>); _2 = &((*_1).0: alloc::raw_vec::RawVec<u8>);
StorageLive(_3); StorageLive(_3);
_3 = &(((*_1).0: alloc::raw_vec::RawVec<u8>).0: alloc::raw_vec::RawVecInner); _3 = &(((*_1).0: alloc::raw_vec::RawVec<u8>).0: alloc::raw_vec::RawVecInner);
StorageLive(_6);
StorageLive(_4);
_4 = copy (((((*_1).0: alloc::raw_vec::RawVec<u8>).0: alloc::raw_vec::RawVecInner).0: std::ptr::Unique<u8>).0: std::ptr::NonNull<u8>); _4 = copy (((((*_1).0: alloc::raw_vec::RawVec<u8>).0: alloc::raw_vec::RawVecInner).0: std::ptr::Unique<u8>).0: std::ptr::NonNull<u8>);
_5 = copy (_4.0: *const u8); _5 = copy (_4.0: *const u8);
_6 = NonNull::<u8> { pointer: copy _5 };
StorageDead(_4);
StorageDead(_6);
StorageDead(_3); StorageDead(_3);
StorageDead(_2); StorageDead(_2);
StorageLive(_6);
_6 = copy ((*_1).1: usize);
StorageLive(_7); StorageLive(_7);
_7 = *const [u8] from (copy _5, copy _6); _7 = copy ((*_1).1: usize);
_0 = &(*_7); StorageLive(_8);
_8 = *const [u8] from (copy _5, copy _7);
_0 = &(*_8);
StorageDead(_8);
StorageDead(_7); StorageDead(_7);
StorageDead(_6);
return; return;
} }
} }