Skip to content

Commit

Permalink
Only mention that a stack frame is being popped when starting to do so
Browse files Browse the repository at this point in the history
  • Loading branch information
oli-obk committed Oct 1, 2020
1 parent 43c181b commit 8f9472c
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions compiler/rustc_mir/src/interpret/eval_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,10 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
/// The cleanup block ends with a special `Resume` terminator, which will
/// cause us to continue unwinding.
pub(super) fn pop_stack_frame(&mut self, unwinding: bool) -> InterpResult<'tcx> {
info!(unwinding);
info!(
"popping stack frame ({})",
if unwinding { "during unwinding" } else { "returning from function" }
);

// Sanity check `unwinding`.
assert_eq!(
Expand Down Expand Up @@ -854,10 +857,6 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
}
}

if !self.stack().is_empty() {
info!(unwinding);
}

Ok(())
}

Expand Down

0 comments on commit 8f9472c

Please sign in to comment.