Cleanup from rebase

src/fn_call.rs

@@ -139,7 +139,7 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a + 'mir>: crate::MiriEvalContextExt<'
     fn emulate_foreign_item(
         &mut self,
         instance: ty::Instance<'tcx>,
-        args: &[OpTy<'tcx, Borrow>],
+        args: &[OpTy<'tcx, Tag>],
         dest: Option<PlaceTy<'tcx, Tag>>,
         ret: Option<mir::BasicBlock>,
     ) -> EvalResult<'tcx, Option<&'mir mir::Mir<'tcx>>> {
@@ -1167,8 +1167,8 @@ fn gen_random<'a, 'mir, 'tcx>(
 /// can proceeed normally.
 fn unwind_stack<'a, 'mir, 'tcx>(
     this: &mut MiriEvalContext<'a, 'mir, 'tcx>,
-    payload_data_ptr: Scalar<Borrow>,
-    payload_vtable_ptr: Scalar<Borrow>
+    payload_data_ptr: Scalar<Tag>,
+    payload_vtable_ptr: Scalar<Tag>
 ) -> EvalResult<'tcx> {
     while !this.stack().is_empty() {
         // When '__rust_maybe_catch_panic' is called, it marks is frame

src/lib.rs

@@ -429,10 +429,10 @@ pub struct FrameData<'tcx> {
 /// If a panic occurs, we update this data with
 /// the information from the panic site
 pub struct UnwindData<'tcx> {
-    pub data: Pointer<Borrow>,
-    pub data_ptr: MPlaceTy<'tcx, stacked_borrows::Borrow>,
-    pub vtable_ptr: MPlaceTy<'tcx, stacked_borrows::Borrow>,
-    pub dest: PlaceTy<'tcx, Borrow>,
+    pub data: Pointer<Tag>,
+    pub data_ptr: MPlaceTy<'tcx, Tag>,
+    pub vtable_ptr: MPlaceTy<'tcx, Tag>,
+    pub dest: PlaceTy<'tcx, Tag>,
     pub ret: mir::BasicBlock
 }
 

src/stacked_borrows.rs

@@ -561,7 +561,7 @@ trait EvalContextPrivExt<'a, 'mir, 'tcx: 'a+'mir>: crate::MiriEvalContextExt<'a,
         protect: bool,
     ) -> EvalResult<'tcx> {
         let this = self.eval_context_mut();
-        let protector = if protect { Some(this.frame().extra) } else { None };
+        let protector = if protect { Some(this.frame().extra.call_id) } else { None };
         let ptr = place.ptr.to_ptr()?;
         trace!("reborrow: {:?} reference {} derived from {} (pointee {}): {:?}, size {}",
             kind, new_tag, ptr.tag, place.layout.ty, ptr, size.bytes());