@@ -92,7 +92,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
9292 & [ data. clone ( ) ] ,
9393 None ,
9494 // Directly return to caller.
95- StackPopCleanup :: Goto { ret, unwind : mir:: UnwindAction :: Continue } ,
95+ ReturnContinuation :: Goto { ret, unwind : mir:: UnwindAction :: Continue } ,
9696 ) ?;
9797
9898 // We ourselves will return `0`, eventually (will be overwritten if we catch a panic).
@@ -143,7 +143,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
143143 & [ catch_unwind. data , payload] ,
144144 None ,
145145 // Directly return to caller of `catch_unwind`.
146- StackPopCleanup :: Goto {
146+ ReturnContinuation :: Goto {
147147 ret : catch_unwind. ret ,
148148 // `catch_fn` must not unwind.
149149 unwind : mir:: UnwindAction :: Unreachable ,
@@ -172,7 +172,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
172172 ExternAbi :: Rust ,
173173 & [ this. mplace_to_ref ( & msg) ?] ,
174174 None ,
175- StackPopCleanup :: Goto { ret : None , unwind } ,
175+ ReturnContinuation :: Goto { ret : None , unwind } ,
176176 )
177177 }
178178
@@ -191,7 +191,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
191191 ExternAbi :: Rust ,
192192 & [ this. mplace_to_ref ( & msg) ?] ,
193193 None ,
194- StackPopCleanup :: Goto { ret : None , unwind : mir:: UnwindAction :: Unreachable } ,
194+ ReturnContinuation :: Goto { ret : None , unwind : mir:: UnwindAction :: Unreachable } ,
195195 )
196196 }
197197
@@ -220,7 +220,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
220220 ExternAbi :: Rust ,
221221 & [ index, len] ,
222222 None ,
223- StackPopCleanup :: Goto { ret : None , unwind } ,
223+ ReturnContinuation :: Goto { ret : None , unwind } ,
224224 ) ?;
225225 }
226226 MisalignedPointerDereference { required, found } => {
@@ -241,7 +241,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
241241 ExternAbi :: Rust ,
242242 & [ required, found] ,
243243 None ,
244- StackPopCleanup :: Goto { ret : None , unwind } ,
244+ ReturnContinuation :: Goto { ret : None , unwind } ,
245245 ) ?;
246246 }
247247
@@ -254,7 +254,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
254254 ExternAbi :: Rust ,
255255 & [ ] ,
256256 None ,
257- StackPopCleanup :: Goto { ret : None , unwind } ,
257+ ReturnContinuation :: Goto { ret : None , unwind } ,
258258 ) ?;
259259 }
260260 }
0 commit comments