Simplify assignment.

cjgillot · cjgillot · commit 1d7f4eb1082b · 2025-10-09T02:53:14.000Z
diff --git a/compiler/rustc_mir_transform/src/coroutine.rs b/compiler/rustc_mir_transform/src/coroutine.rs
@@ -512,17 +512,15 @@ fn make_coroutine_state_argument_pinned<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body
     SelfArgVisitor::new(tcx, tcx.mk_place_deref(unpinned_local.into())).visit_body(body);
 
     let source_info = SourceInfo::outermost(body.span);
+    let pin_field = tcx.mk_place_field(SELF_ARG.into(), FieldIdx::ZERO, ref_coroutine_ty);
+
     body.basic_blocks_mut()[START_BLOCK].statements.insert(
         0,
         Statement::new(
             source_info,
             StatementKind::Assign(Box::new((
                 unpinned_local.into(),
-                Rvalue::CopyForDeref(tcx.mk_place_field(
-                    SELF_ARG.into(),
-                    FieldIdx::ZERO,
-                    ref_coroutine_ty,
-                )),
+                Rvalue::Use(Operand::Copy(pin_field)),
             ))),
         ),
     );
diff --git a/tests/mir-opt/async_drop_live_dead.a-{closure#0}.coroutine_drop_async.0.panic-abort.mir b/tests/mir-opt/async_drop_live_dead.a-{closure#0}.coroutine_drop_async.0.panic-abort.mir
@@ -27,7 +27,7 @@ fn a::{closure#0}(_1: Pin<&mut {async fn body of a<T>()}>, _2: &mut Context<'_>)
     }
 
     bb0: {
-        _20 = deref_copy (_1.0: &mut {async fn body of a<T>()});
+        _20 = copy (_1.0: &mut {async fn body of a<T>()});
         _19 = discriminant((*_20));
         switchInt(move _19) -> [0: bb9, 3: bb12, 4: bb13, otherwise: bb14];
     }
diff --git a/tests/mir-opt/async_drop_live_dead.a-{closure#0}.coroutine_drop_async.0.panic-unwind.mir b/tests/mir-opt/async_drop_live_dead.a-{closure#0}.coroutine_drop_async.0.panic-unwind.mir
@@ -27,7 +27,7 @@ fn a::{closure#0}(_1: Pin<&mut {async fn body of a<T>()}>, _2: &mut Context<'_>)
     }
 
     bb0: {
-        _20 = deref_copy (_1.0: &mut {async fn body of a<T>()});
+        _20 = copy (_1.0: &mut {async fn body of a<T>()});
         _19 = discriminant((*_20));
         switchInt(move _19) -> [0: bb12, 2: bb18, 3: bb16, 4: bb17, otherwise: bb19];
     }
diff --git a/tests/mir-opt/building/async_await.a-{closure#0}.coroutine_resume.0.mir b/tests/mir-opt/building/async_await.a-{closure#0}.coroutine_resume.0.mir
@@ -17,7 +17,7 @@ fn a::{closure#0}(_1: Pin<&mut {async fn body of a()}>, _2: &mut Context<'_>) ->
     let mut _5: &mut {async fn body of a()};
 
     bb0: {
-        _5 = deref_copy (_1.0: &mut {async fn body of a()});
+        _5 = copy (_1.0: &mut {async fn body of a()});
         _4 = discriminant((*_5));
         switchInt(move _4) -> [0: bb1, 1: bb4, otherwise: bb5];
     }
diff --git a/tests/mir-opt/building/async_await.b-{closure#0}.coroutine_resume.0.mir b/tests/mir-opt/building/async_await.b-{closure#0}.coroutine_resume.0.mir
@@ -103,7 +103,7 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body of b()}>, _2: &mut Context<'_>) ->
     }
 
     bb0: {
-        _39 = deref_copy (_1.0: &mut {async fn body of b()});
+        _39 = copy (_1.0: &mut {async fn body of b()});
         _38 = discriminant((*_39));
         switchInt(move _38) -> [0: bb1, 1: bb29, 3: bb27, 4: bb28, otherwise: bb8];
     }
diff --git a/tests/mir-opt/building/coroutine.main-{closure#0}.StateTransform.after.mir b/tests/mir-opt/building/coroutine.main-{closure#0}.StateTransform.after.mir
@@ -43,7 +43,7 @@ fn main::{closure#0}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:18:5: 18:18}>, _2
     let mut _18: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18};
 
     bb0: {
-        _18 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
+        _18 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
         _17 = discriminant((*_18));
         switchInt(move _17) -> [0: bb1, 1: bb19, 3: bb17, 4: bb18, otherwise: bb20];
     }
diff --git a/tests/mir-opt/building/coroutine.main-{closure#1}.StateTransform.after.mir b/tests/mir-opt/building/coroutine.main-{closure#1}.StateTransform.after.mir
@@ -43,7 +43,7 @@ fn main::{closure#1}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:25:5: 25:18}>, _2
     let mut _18: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18};
 
     bb0: {
-        _18 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
+        _18 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
         _17 = discriminant((*_18));
         switchInt(move _17) -> [0: bb1, 1: bb19, 3: bb17, 4: bb18, otherwise: bb20];
     }
diff --git a/tests/mir-opt/coroutine_tiny.main-{closure#0}.coroutine_resume.0.mir b/tests/mir-opt/coroutine_tiny.main-{closure#0}.coroutine_resume.0.mir
@@ -38,7 +38,7 @@ fn main::{closure#0}(_1: Pin<&mut {coroutine@$DIR/coroutine_tiny.rs:21:5: 21:13}
     }
 
     bb0: {
-        _11 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine_tiny.rs:21:5: 21:13});
+        _11 = copy (_1.0: &mut {coroutine@$DIR/coroutine_tiny.rs:21:5: 21:13});
         _10 = discriminant((*_11));
         switchInt(move _10) -> [0: bb1, 3: bb5, otherwise: bb6];
     }
diff --git a/tests/mir-opt/inline_coroutine_body.run2-{closure#0}.Inline.panic-abort.diff b/tests/mir-opt/inline_coroutine_body.run2-{closure#0}.Inline.panic-abort.diff
@@ -125,7 +125,7 @@
 +         StorageLive(_30);
 +         StorageLive(_31);
 +         StorageLive(_32);
-+         _32 = deref_copy (_8.0: &mut {async fn body of ActionPermit<'_, T>::perform()});
++         _32 = copy (_8.0: &mut {async fn body of ActionPermit<'_, T>::perform()});
 +         _31 = discriminant((*_32));
 +         switchInt(move _31) -> [0: bb3, 1: bb10, 3: bb9, otherwise: bb5];
       }
diff --git a/tests/mir-opt/inline_coroutine_body.run2-{closure#0}.Inline.panic-unwind.diff b/tests/mir-opt/inline_coroutine_body.run2-{closure#0}.Inline.panic-unwind.diff
@@ -125,7 +125,7 @@
 +         StorageLive(_30);
 +         StorageLive(_31);
 +         StorageLive(_32);
-+         _32 = deref_copy (_8.0: &mut {async fn body of ActionPermit<'_, T>::perform()});
++         _32 = copy (_8.0: &mut {async fn body of ActionPermit<'_, T>::perform()});
 +         _31 = discriminant((*_32));
 +         switchInt(move _31) -> [0: bb5, 1: bb15, 2: bb14, 3: bb13, otherwise: bb7];
       }
diff --git a/tests/ui/rustc_public-ir-print/async-closure.stdout b/tests/ui/rustc_public-ir-print/async-closure.stdout
@@ -46,7 +46,7 @@ fn foo::{closure#0}::{closure#0}(_1: Pin<&mut {async closure body@$DIR/async-clo
     debug y => (*((*_7).0: &i32));
     debug y => _3;
     bb0: {
-        _7 = CopyForDeref((_1.0: &mut {async closure body@$DIR/async-closure.rs:9:22: 11:6}));
+        _7 = (_1.0: &mut {async closure body@$DIR/async-closure.rs:9:22: 11:6});
         _6 = discriminant((*_7));
         switchInt(move _6) -> [0: bb1, 1: bb2, otherwise: bb3];
     }
@@ -78,7 +78,7 @@ fn foo::{closure#0}::{synthetic#0}(_1: Pin<&mut {async closure body@$DIR/async-c
     debug y => (*((*_7).0: &i32));
     debug y => _3;
     bb0: {
-        _7 = CopyForDeref((_1.0: &mut {async closure body@$DIR/async-closure.rs:9:22: 11:6}));
+        _7 = (_1.0: &mut {async closure body@$DIR/async-closure.rs:9:22: 11:6});
         _6 = discriminant((*_7));
         switchInt(move _6) -> [0: bb1, 1: bb2, otherwise: bb3];
     }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ fn a::{closure#0}(_1: Pin<&mut {async fn body of a<T>()}>, _2: &mut Context<'_>)`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`bb0: {`
`30`		`- _20 = deref_copy (_1.0: &mut {async fn body of a<T>()});`
	`30`	`+ _20 = copy (_1.0: &mut {async fn body of a<T>()});`
`31`	`31`	`_19 = discriminant((*_20));`
`32`	`32`	`switchInt(move _19) -> [0: bb9, 3: bb12, 4: bb13, otherwise: bb14];`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ fn a::{closure#0}(_1: Pin<&mut {async fn body of a()}>, _2: &mut Context<'_>) ->`
`17`	`17`	`let mut _5: &mut {async fn body of a()};`
`18`	`18`
`19`	`19`	`bb0: {`
`20`		`- _5 = deref_copy (_1.0: &mut {async fn body of a()});`
	`20`	`+ _5 = copy (_1.0: &mut {async fn body of a()});`
`21`	`21`	`_4 = discriminant((*_5));`
`22`	`22`	`switchInt(move _4) -> [0: bb1, 1: bb4, otherwise: bb5];`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body of b()}>, _2: &mut Context<'_>) ->`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`bb0: {`
`106`		`- _39 = deref_copy (_1.0: &mut {async fn body of b()});`
	`106`	`+ _39 = copy (_1.0: &mut {async fn body of b()});`
`107`	`107`	`_38 = discriminant((*_39));`
`108`	`108`	`switchInt(move _38) -> [0: bb1, 1: bb29, 3: bb27, 4: bb28, otherwise: bb8];`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ fn main::{closure#0}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:18:5: 18:18}>, _2`
`43`	`43`	`let mut _18: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18};`
`44`	`44`
`45`	`45`	`bb0: {`
`46`		`- _18 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});`
	`46`	`+ _18 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});`
`47`	`47`	`_17 = discriminant((*_18));`
`48`	`48`	`switchInt(move _17) -> [0: bb1, 1: bb19, 3: bb17, 4: bb18, otherwise: bb20];`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ fn main::{closure#1}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:25:5: 25:18}>, _2`
`43`	`43`	`let mut _18: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18};`
`44`	`44`
`45`	`45`	`bb0: {`
`46`		`- _18 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});`
	`46`	`+ _18 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});`
`47`	`47`	`_17 = discriminant((*_18));`
`48`	`48`	`switchInt(move _17) -> [0: bb1, 1: bb19, 3: bb17, 4: bb18, otherwise: bb20];`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ fn main::{closure#0}(_1: Pin<&mut {coroutine@$DIR/coroutine_tiny.rs:21:5: 21:13}`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`bb0: {`
`41`		`- _11 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine_tiny.rs:21:5: 21:13});`
	`41`	`+ _11 = copy (_1.0: &mut {coroutine@$DIR/coroutine_tiny.rs:21:5: 21:13});`
`42`	`42`	`_10 = discriminant((*_11));`
`43`	`43`	`switchInt(move _10) -> [0: bb1, 3: bb5, otherwise: bb6];`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@`
`125`	`125`	`+ StorageLive(_30);`
`126`	`126`	`+ StorageLive(_31);`
`127`	`127`	`+ StorageLive(_32);`
`128`		`-+ _32 = deref_copy (_8.0: &mut {async fn body of ActionPermit<'_, T>::perform()});`
	`128`	`++ _32 = copy (_8.0: &mut {async fn body of ActionPermit<'_, T>::perform()});`
`129`	`129`	`+ _31 = discriminant((*_32));`
`130`	`130`	`+ switchInt(move _31) -> [0: bb3, 1: bb10, 3: bb9, otherwise: bb5];`
`131`	`131`	`}`