A few minor tweaks

This commit is contained in:
Aaron Hill 2019-10-20 21:31:43 -04:00
parent 01c11f9fb5
commit 64a43f45d2
No known key found for this signature in database
GPG Key ID: B4087E510E98B164
2 changed files with 3 additions and 2 deletions

View File

@ -474,7 +474,8 @@ fn stack_push(_ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx> {
/// Called immediately before a stack frame gets popped.
#[inline(always)]
fn stack_pop(
_ecx: &mut InterpCx<'mir, 'tcx, Self>, _extra: (),
_ecx: &mut InterpCx<'mir, 'tcx, Self>,
_extra: (),
) -> InterpResult<'tcx, StackPopInfo> {
// Const-eval mode does not support unwinding from panics
Ok(StackPopInfo::Normal)

View File

@ -98,7 +98,7 @@ pub enum StackPopCleanup {
/// Jump to the next block in the caller, or cause UB if None (that's a function
/// that may never return). Also store layout of return place so
/// we can validate it at that layout.
/// 'ret' stores the block we jump to on a normal return, while 'unwind'
/// `ret` stores the block we jump to on a normal return, while 'unwind'
/// stores the block used for cleanup during unwinding
Goto { ret: Option<mir::BasicBlock>, unwind: Option<mir::BasicBlock> },
/// Just do nohing: Used by Main and for the box_alloc hook in miri.