fix(upstream): Rvalue::Use gains WithRetag

Author: nbdd0121

flake.lock

@@ -349,7 +349,7 @@ impl<'tcx> LateLintPass<'tcx> for AtomicContext<'tcx> {
                     ItemKind::Struct(..) | ItemKind::Union(..) | ItemKind::Enum(..) => {
                         (self.adt_callback)(i.item_id().owner_id.def_id);
                     }
-                    ItemKind::Trait { .. }  => {
+                    ItemKind::Trait { .. } => {
                         // Not exactly an ADT, but we want to track drop_preempt_count on traits as well.
                         (self.adt_callback)(i.item_id().owner_id.def_id);
                     }

src/atomic_context.rs

@@ -10,7 +10,7 @@ use rustc_hir::{self as hir, def::DefKind};
 use rustc_middle::mir::CallSource;
 use rustc_middle::mir::{
     Body, ConstOperand, LocalDecl, Operand, Place, ProjectionElem, Rvalue, SourceInfo, Statement,
-    StatementKind, TerminatorKind,
+    StatementKind, TerminatorKind, WithRetag,
 };
 use rustc_middle::ty::{self, TyCtxt};
 use rustc_span::def_id::{CrateNum, DefId, DefIndex, LocalDefId};
@@ -74,7 +74,7 @@ fn remap_mir_for_const_eval_select<'tcx>(
                                 SourceInfo::outermost(fn_span),
                                 StatementKind::Assign(Box::new((
                                     local.into(),
-                                    Rvalue::Use(tupled_args.node.clone()),
+                                    Rvalue::Use(tupled_args.node.clone(), WithRetag::Yes),
                                 ))),
                             ));
                             (Operand::Move, local.into())

src/mir.rs

@@ -375,11 +375,10 @@ where
             let obj_ref_place = Place::from(self.new_temp(unwrap_ty));
             call_statements.push(self.assign(
                 obj_ref_place,
-                Rvalue::Use(Operand::Copy(tcx.mk_place_field(
-                    pin_obj_place,
-                    FieldIdx::ZERO,
-                    unwrap_ty,
-                ))),
+                Rvalue::Use(
+                    Operand::Copy(tcx.mk_place_field(pin_obj_place, FieldIdx::ZERO, unwrap_ty)),
+                    WithRetag::Yes,
+                ),
             ));
 
             let obj_ptr_place = Place::from(self.new_temp(obj_ptr_ty));
@@ -1349,7 +1348,7 @@ where
                         Operand::Copy(Place::from(self.place.local)),
                     ),
                 ),
-                self.assign(cur.into(), Rvalue::Use(zero)),
+                self.assign(cur.into(), Rvalue::Use(zero, WithRetag::Yes)),
             ],
             Some(Terminator {
                 source_info: self.source_info,