Remove unsound-mir-opts for simplify_aggregate_to_copy

dianqk · dianqk · commit 8d8a46ed6252 · 2024-12-04T18:27:02.000+08:00
diff --git a/compiler/rustc_mir_transform/src/gvn.rs b/compiler/rustc_mir_transform/src/gvn.rs
@@ -1081,9 +1081,7 @@ impl<'body, 'tcx> VnState<'body, 'tcx> {
             }
         }
 
-        // unsound: https://github.com/rust-lang/rust/issues/132353
-        if tcx.sess.opts.unstable_opts.unsound_mir_opts
-            && let AggregateTy::Def(_, _) = ty
+        if let AggregateTy::Def(_, _) = ty
             && let Some(value) =
                 self.simplify_aggregate_to_copy(rvalue, location, &fields, variant_index)
         {
diff --git a/tests/mir-opt/pre-codegen/try_identity.old.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/try_identity.old.PreCodegen.after.mir
@@ -19,14 +19,14 @@ fn old(_1: Result<T, E>) -> Result<T, E> {
     }
 
     bb1: {
-        _3 = move ((_1 as Ok).0: T);
-        _0 = Result::<T, E>::Ok(copy _3);
+        _3 = copy ((_1 as Ok).0: T);
+        _0 = copy _1;
         goto -> bb3;
     }
 
     bb2: {
-        _4 = move ((_1 as Err).0: E);
-        _0 = Result::<T, E>::Err(copy _4);
+        _4 = copy ((_1 as Err).0: E);
+        _0 = copy _1;
         goto -> bb3;
     }
 
diff --git a/tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-abort.mir
@@ -7,7 +7,7 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
         debug self => _1;
         scope 2 (inlined Vec::<u8>::as_slice) {
             debug self => _1;
-            let mut _7: usize;
+            let mut _6: usize;
             scope 3 (inlined Vec::<u8>::as_ptr) {
                 debug self => _1;
                 let mut _2: &alloc::raw_vec::RawVec<u8>;
@@ -16,7 +16,6 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
                     let mut _3: &alloc::raw_vec::RawVecInner;
                     scope 5 (inlined alloc::raw_vec::RawVecInner::ptr::<u8>) {
                         debug self => _3;
-                        let mut _6: std::ptr::NonNull<u8>;
                         scope 6 (inlined alloc::raw_vec::RawVecInner::non_null::<u8>) {
                             debug self => _3;
                             let mut _4: std::ptr::NonNull<u8>;
@@ -32,20 +31,20 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
                                 }
                             }
                             scope 10 (inlined Unique::<u8>::as_non_null_ptr) {
-                                debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _6;
+                                debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _4;
                                 debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;
                             }
                         }
                         scope 11 (inlined NonNull::<u8>::as_ptr) {
-                            debug self => _6;
+                            debug self => _4;
                         }
                     }
                 }
             }
             scope 12 (inlined std::slice::from_raw_parts::<'_, u8>) {
                 debug data => _5;
-                debug len => _7;
-                let _8: *const [u8];
+                debug len => _6;
+                let _7: *const [u8];
                 scope 13 (inlined core::ub_checks::check_language_ub) {
                     scope 14 (inlined core::ub_checks::check_language_ub::runtime) {
                     }
@@ -56,10 +55,10 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
                 }
                 scope 17 (inlined slice_from_raw_parts::<u8>) {
                     debug data => _5;
-                    debug len => _7;
+                    debug len => _6;
                     scope 18 (inlined std::ptr::from_raw_parts::<[u8], u8>) {
                         debug data_pointer => _5;
-                        debug metadata => _7;
+                        debug metadata => _6;
                     }
                 }
             }
@@ -71,22 +70,17 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
         _2 = &((*_1).0: alloc::raw_vec::RawVec<u8>);
         StorageLive(_3);
         _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>);
         _5 = copy (_4.0: *const u8);
-        _6 = NonNull::<u8> { pointer: copy _5 };
-        StorageDead(_4);
-        StorageDead(_6);
         StorageDead(_3);
         StorageDead(_2);
+        StorageLive(_6);
+        _6 = copy ((*_1).1: usize);
         StorageLive(_7);
-        _7 = copy ((*_1).1: usize);
-        StorageLive(_8);
-        _8 = *const [u8] from (copy _5, copy _7);
-        _0 = &(*_8);
-        StorageDead(_8);
+        _7 = *const [u8] from (copy _5, copy _6);
+        _0 = &(*_7);
         StorageDead(_7);
+        StorageDead(_6);
         return;
     }
 }
diff --git a/tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-unwind.mir
@@ -7,7 +7,7 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
         debug self => _1;
         scope 2 (inlined Vec::<u8>::as_slice) {
             debug self => _1;
-            let mut _7: usize;
+            let mut _6: usize;
             scope 3 (inlined Vec::<u8>::as_ptr) {
                 debug self => _1;
                 let mut _2: &alloc::raw_vec::RawVec<u8>;
@@ -16,7 +16,6 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
                     let mut _3: &alloc::raw_vec::RawVecInner;
                     scope 5 (inlined alloc::raw_vec::RawVecInner::ptr::<u8>) {
                         debug self => _3;
-                        let mut _6: std::ptr::NonNull<u8>;
                         scope 6 (inlined alloc::raw_vec::RawVecInner::non_null::<u8>) {
                             debug self => _3;
                             let mut _4: std::ptr::NonNull<u8>;
@@ -32,20 +31,20 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
                                 }
                             }
                             scope 10 (inlined Unique::<u8>::as_non_null_ptr) {
-                                debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _6;
+                                debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _4;
                                 debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;
                             }
                         }
                         scope 11 (inlined NonNull::<u8>::as_ptr) {
-                            debug self => _6;
+                            debug self => _4;
                         }
                     }
                 }
             }
             scope 12 (inlined std::slice::from_raw_parts::<'_, u8>) {
                 debug data => _5;
-                debug len => _7;
-                let _8: *const [u8];
+                debug len => _6;
+                let _7: *const [u8];
                 scope 13 (inlined core::ub_checks::check_language_ub) {
                     scope 14 (inlined core::ub_checks::check_language_ub::runtime) {
                     }
@@ -56,10 +55,10 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
                 }
                 scope 17 (inlined slice_from_raw_parts::<u8>) {
                     debug data => _5;
-                    debug len => _7;
+                    debug len => _6;
                     scope 18 (inlined std::ptr::from_raw_parts::<[u8], u8>) {
                         debug data_pointer => _5;
-                        debug metadata => _7;
+                        debug metadata => _6;
                     }
                 }
             }
@@ -71,22 +70,17 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
         _2 = &((*_1).0: alloc::raw_vec::RawVec<u8>);
         StorageLive(_3);
         _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>);
         _5 = copy (_4.0: *const u8);
-        _6 = NonNull::<u8> { pointer: copy _5 };
-        StorageDead(_4);
-        StorageDead(_6);
         StorageDead(_3);
         StorageDead(_2);
+        StorageLive(_6);
+        _6 = copy ((*_1).1: usize);
         StorageLive(_7);
-        _7 = copy ((*_1).1: usize);
-        StorageLive(_8);
-        _8 = *const [u8] from (copy _5, copy _7);
-        _0 = &(*_8);
-        StorageDead(_8);
+        _7 = *const [u8] from (copy _5, copy _6);
+        _0 = &(*_7);
         StorageDead(_7);
+        StorageDead(_6);
         return;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1081,9 +1081,7 @@ impl<'body, 'tcx> VnState<'body, 'tcx> {`
`1081`	`1081`	`}`
`1082`	`1082`	`}`
`1083`	`1083`
`1084`		`- // unsound: https://github.com/rust-lang/rust/issues/132353`
`1085`		`- if tcx.sess.opts.unstable_opts.unsound_mir_opts`
`1086`		`- && let AggregateTy::Def(_, _) = ty`
	`1084`	`+ if let AggregateTy::Def(_, _) = ty`
`1087`	`1085`	`&& let Some(value) =`
`1088`	`1086`	`self.simplify_aggregate_to_copy(rvalue, location, &fields, variant_index)`
`1089`	`1087`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@ fn old(_1: Result<T, E>) -> Result<T, E> {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`bb1: {`
`22`		`- _3 = move ((_1 as Ok).0: T);`
`23`		`- _0 = Result::<T, E>::Ok(copy _3);`
	`22`	`+ _3 = copy ((_1 as Ok).0: T);`
	`23`	`+ _0 = copy _1;`
`24`	`24`	`goto -> bb3;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`bb2: {`
`28`		`- _4 = move ((_1 as Err).0: E);`
`29`		`- _0 = Result::<T, E>::Err(copy _4);`
	`28`	`+ _4 = copy ((_1 as Err).0: E);`
	`29`	`+ _0 = copy _1;`
`30`	`30`	`goto -> bb3;`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {`
`7`	`7`	`debug self => _1;`
`8`	`8`	`scope 2 (inlined Vec::<u8>::as_slice) {`
`9`	`9`	`debug self => _1;`
`10`		`- let mut _7: usize;`
	`10`	`+ let mut _6: usize;`
`11`	`11`	`scope 3 (inlined Vec::<u8>::as_ptr) {`
`12`	`12`	`debug self => _1;`
`13`	`13`	`let mut _2: &alloc::raw_vec::RawVec<u8>;`
`@@ -16,7 +16,6 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {`
`16`	`16`	`let mut _3: &alloc::raw_vec::RawVecInner;`
`17`	`17`	`scope 5 (inlined alloc::raw_vec::RawVecInner::ptr::<u8>) {`
`18`	`18`	`debug self => _3;`
`19`		`- let mut _6: std::ptr::NonNull<u8>;`
`20`	`19`	`scope 6 (inlined alloc::raw_vec::RawVecInner::non_null::<u8>) {`
`21`	`20`	`debug self => _3;`
`22`	`21`	`let mut _4: std::ptr::NonNull<u8>;`
`@@ -32,20 +31,20 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {`
`32`	`31`	`}`
`33`	`32`	`}`
`34`	`33`	`scope 10 (inlined Unique::<u8>::as_non_null_ptr) {`
`35`		`- debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _6;`
	`34`	`+ debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _4;`
`36`	`35`	`debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;`
`37`	`36`	`}`
`38`	`37`	`}`
`39`	`38`	`scope 11 (inlined NonNull::<u8>::as_ptr) {`
`40`		`- debug self => _6;`
	`39`	`+ debug self => _4;`
`41`	`40`	`}`
`42`	`41`	`}`
`43`	`42`	`}`
`44`	`43`	`}`
`45`	`44`	`scope 12 (inlined std::slice::from_raw_parts::<'_, u8>) {`
`46`	`45`	`debug data => _5;`
`47`		`- debug len => _7;`
`48`		`- let _8: *const [u8];`
	`46`	`+ debug len => _6;`
	`47`	`+ let _7: *const [u8];`
`49`	`48`	`scope 13 (inlined core::ub_checks::check_language_ub) {`
`50`	`49`	`scope 14 (inlined core::ub_checks::check_language_ub::runtime) {`
`51`	`50`	`}`
`@@ -56,10 +55,10 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {`
`56`	`55`	`}`
`57`	`56`	`scope 17 (inlined slice_from_raw_parts::<u8>) {`
`58`	`57`	`debug data => _5;`
`59`		`- debug len => _7;`
	`58`	`+ debug len => _6;`
`60`	`59`	`scope 18 (inlined std::ptr::from_raw_parts::<[u8], u8>) {`
`61`	`60`	`debug data_pointer => _5;`
`62`		`- debug metadata => _7;`
	`61`	`+ debug metadata => _6;`
`63`	`62`	`}`
`64`	`63`	`}`
`65`	`64`	`}`
`@@ -71,22 +70,17 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {`
`71`	`70`	`_2 = &((*_1).0: alloc::raw_vec::RawVec<u8>);`
`72`	`71`	`StorageLive(_3);`
`73`	`72`	`_3 = &(((*_1).0: alloc::raw_vec::RawVec<u8>).0: alloc::raw_vec::RawVecInner);`
`74`		`- StorageLive(_6);`
`75`		`- StorageLive(_4);`
`76`	`73`	`_4 = copy (((((*_1).0: alloc::raw_vec::RawVec<u8>).0: alloc::raw_vec::RawVecInner).0: std::ptr::Unique<u8>).0: std::ptr::NonNull<u8>);`
`77`	`74`	`_5 = copy (_4.0: *const u8);`
`78`		`- _6 = NonNull::<u8> { pointer: copy _5 };`
`79`		`- StorageDead(_4);`
`80`		`- StorageDead(_6);`
`81`	`75`	`StorageDead(_3);`
`82`	`76`	`StorageDead(_2);`
	`77`	`+ StorageLive(_6);`
	`78`	`+ _6 = copy ((*_1).1: usize);`
`83`	`79`	`StorageLive(_7);`
`84`		`- _7 = copy ((*_1).1: usize);`
`85`		`- StorageLive(_8);`
`86`		`- _8 = *const [u8] from (copy _5, copy _7);`
`87`		`- _0 = &(*_8);`
`88`		`- StorageDead(_8);`
	`80`	`+ _7 = *const [u8] from (copy _5, copy _6);`
	`81`	`+ _0 = &(*_7);`
`89`	`82`	`StorageDead(_7);`
	`83`	`+ StorageDead(_6);`
`90`	`84`	`return;`
`91`	`85`	`}`
`92`	`86`	`}`