Begin updating for rustc changes

Author: Aaron1011

src/fn_call.rs

@@ -292,7 +292,7 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a + 'mir>: crate::MiriEvalContextExt<'
                     box_me_up_mir.span,
                     box_me_up_mir,
                     Some(temp_ptr.into()),
-                    StackPopCleanup::None { cleanup: true }
+                    StackPopCleanup::None { cleanup: true, unwind: None }
                 )?;
 
                 let mut args = this.frame().mir.args_iter();
@@ -566,7 +566,7 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a + 'mir>: crate::MiriEvalContextExt<'
                     mir,
                     Some(ret_place),
                     // Directly return to caller.
-                    StackPopCleanup::Goto(Some(ret)),
+                    StackPopCleanup::Goto { ret: Some(ret), unwind: None },
                 )?;
 
                 let mut args = this.frame().mir.args_iter();
@@ -1226,7 +1226,8 @@ fn unwind_stack<'a, 'mir, 'tcx>(
             }
 
             // Pop this frame, and continue on to the next one
-            this.pop_stack_frame_unwind()?;
+            //this.pop_stack_frame()?;
+            //this.pop_stack_frame_unwind()?;
         }
     }
 

src/helpers.rs

@@ -27,7 +27,7 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a + 'mir>: crate::MiriEvalContextExt<'
                     for item in mem::replace(&mut items, Default::default()).iter() {
                         if item.ident.name.as_str() == *segment {
                             if path_it.peek().is_none() {
-                                return Some(ty::Instance::mono(this.tcx.tcx, item.def.def_id()));
+                                return Some(ty::Instance::mono(this.tcx.tcx, item.res.def_id()).def_id());
                             }
 
                             items = this.tcx.item_children(item.res.def_id());

src/lib.rs

@@ -124,7 +124,7 @@ pub fn create_ecx<'a, 'mir: 'a, 'tcx: 'mir>(
         DUMMY_SP,
         start_mir,
         Some(ret_ptr.into()),
-        StackPopCleanup::None { cleanup: true },
+        StackPopCleanup::None { cleanup: true, unwind: None },
     )?;
 
     let mut args = ecx.frame().mir.args_iter();
@@ -375,7 +375,11 @@ pub struct Evaluator<'tcx> {
 
     /// Extra information needed for unwinding
     /// This is 'None' when we're running in abort mode
-    pub(crate) cached_data: Option<CachedTypes<'tcx>>
+    pub(crate) cached_data: Option<CachedTypes<'tcx>>,
+
+    /// Whether or not we are currently unwinding from
+    /// a panic
+    pub(crate) unwinding: bool
 }
 
 pub struct CachedTypes<'tcx> {
@@ -394,7 +398,8 @@ impl<'tcx> Evaluator<'tcx> {
             tls: TlsData::default(),
             validate,
             rng: seed.map(|s| StdRng::seed_from_u64(s)),
-            cached_data: None
+            cached_data: None,
+            unwinding: false
         }
     }
 }
@@ -503,7 +508,7 @@ impl<'a, 'mir, 'tcx> Machine<'a, 'mir, 'tcx> for Evaluator<'tcx> {
             // Don't do anything when we are done. The `statement()` function will increment
             // the old stack frame's stmt counter to the next statement, which means that when
             // `exchange_malloc` returns, we go on evaluating exactly where we want to be.
-            StackPopCleanup::None { cleanup: true },
+            StackPopCleanup::None { cleanup: true, unwind: None },
         )?;
 
         let mut args = ecx.frame().mir.args_iter();
@@ -636,7 +641,8 @@ impl<'a, 'mir, 'tcx> Machine<'a, 'mir, 'tcx> for Evaluator<'tcx> {
     fn stack_pop(
         ecx: &mut InterpretCx<'a, 'mir, 'tcx, Self>,
         extra: FrameData,
-    ) -> EvalResult<'tcx> {
-        Ok(ecx.memory().extra.borrow_mut().end_call(extra.call_id))
+    ) -> EvalResult<'tcx, StackPopInfo> {
+        ecx.memory().extra.borrow_mut().end_call(extra.call_id);
+        Ok(StackPopInfo { unwinding: ecx.machine.unwinding })
     }
 }

src/tls.rs

@@ -146,7 +146,7 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a+'mir>: crate::MiriEvalContextExt<'a,
                 mir.span,
                 mir,
                 Some(ret_place),
-                StackPopCleanup::None { cleanup: true },
+                StackPopCleanup::None { cleanup: true, unwind: None },
             )?;
             let arg_local = this.frame().mir.args_iter().next().ok_or_else(
                 || InterpError::AbiViolation("TLS dtor does not take enough arguments.".to_owned()),