Some cleanup

Author: Aaron1011

src/fn_call.rs

@@ -216,6 +216,7 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a + 'mir>: crate::MiriEvalContextExt<'
                 // 'payload'. This should help catch some basic errors in
                 // the caller of this function, even in abort mode
                 if this.tcx.tcx.sess.panic_strategy() == PanicStrategy::Abort  {
+                    // FIXME: Actually print out the payload here
                     return err!(MachineError("the evaluated program abort-panicked".to_string()));
                 }
 
@@ -1171,9 +1172,6 @@ fn unwind_stack<'a, 'mir, 'tcx>(
     payload_data_ptr: Scalar<Borrow>,
     payload_vtable_ptr: Scalar<Borrow>
 ) -> EvalResult<'tcx> {
-
-    let mut found = false;
-
     while !this.stack().is_empty() {
         // When '__rust_maybe_catch_panic' is called, it marks is frame
         // with 'catch_panic'. When we find this marker, we've found
@@ -1202,9 +1200,8 @@ fn unwind_stack<'a, 'mir, 'tcx>(
             // We're done - continue execution in the frame of the function
             // that called '__rust_maybe_catch_panic,'
             this.goto_block(Some(ret))?;
-            found = true;
 
-            break;
+            return Ok(())
         } else {
             // This frame is above our target frame on the call stack.
             // We pop it off the stack, running its 'unwind' block if applicable
@@ -1233,9 +1230,7 @@ fn unwind_stack<'a, 'mir, 'tcx>(
         }
     }
 
-    if !found {
-        // The 'start_fn' lang item should always install a panic handler
-        return err!(Unreachable);
-    }
-    return Ok(())
+    // We should never get here:
+    // The 'start_fn' lang item should always install a panic handler
+    return err!(Unreachable);
 }