make StackPop field names less confusing
This commit is contained in:
committed by
Maybe Lapkin
parent
cda6f0c25d
commit
236352024b
@@ -23,10 +23,11 @@ use super::{
|
||||
MemoryKind, Misalignment, OpTy, PlaceTy, Pointer, Provenance,
|
||||
};
|
||||
|
||||
/// Data returned by Machine::stack_pop,
|
||||
/// to provide further control over the popping of the stack frame
|
||||
/// Data returned by [`Machine::after_stack_pop`], and consumed by
|
||||
/// [`InterpCx::return_from_current_stack_frame`] to determine what actions should be done when
|
||||
/// returning from a stack frame.
|
||||
#[derive(Eq, PartialEq, Debug, Copy, Clone)]
|
||||
pub enum StackPopJump {
|
||||
pub enum ReturnAction {
|
||||
/// Indicates that no special handling should be
|
||||
/// done - we'll either return normally or unwind
|
||||
/// based on the terminator for the function
|
||||
@@ -525,10 +526,10 @@ pub trait Machine<'tcx>: Sized {
|
||||
_ecx: &mut InterpCx<'tcx, Self>,
|
||||
_frame: Frame<'tcx, Self::Provenance, Self::FrameExtra>,
|
||||
unwinding: bool,
|
||||
) -> InterpResult<'tcx, StackPopJump> {
|
||||
) -> InterpResult<'tcx, ReturnAction> {
|
||||
// By default, we do not support unwinding from panics
|
||||
assert!(!unwinding);
|
||||
Ok(StackPopJump::Normal)
|
||||
Ok(ReturnAction::Normal)
|
||||
}
|
||||
|
||||
/// Called immediately after actual memory was allocated for a local
|
||||
|
||||
Reference in New Issue
Block a user