@@ -92,7 +92,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
92
92
& [ data. clone ( ) ] ,
93
93
None ,
94
94
// Directly return to caller.
95
- StackPopCleanup :: Goto { ret, unwind : mir:: UnwindAction :: Continue } ,
95
+ ReturnContinuation :: Goto { ret, unwind : mir:: UnwindAction :: Continue } ,
96
96
) ?;
97
97
98
98
// 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> {
143
143
& [ catch_unwind. data , payload] ,
144
144
None ,
145
145
// Directly return to caller of `catch_unwind`.
146
- StackPopCleanup :: Goto {
146
+ ReturnContinuation :: Goto {
147
147
ret : catch_unwind. ret ,
148
148
// `catch_fn` must not unwind.
149
149
unwind : mir:: UnwindAction :: Unreachable ,
@@ -172,7 +172,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
172
172
ExternAbi :: Rust ,
173
173
& [ this. mplace_to_ref ( & msg) ?] ,
174
174
None ,
175
- StackPopCleanup :: Goto { ret : None , unwind } ,
175
+ ReturnContinuation :: Goto { ret : None , unwind } ,
176
176
)
177
177
}
178
178
@@ -191,7 +191,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
191
191
ExternAbi :: Rust ,
192
192
& [ this. mplace_to_ref ( & msg) ?] ,
193
193
None ,
194
- StackPopCleanup :: Goto { ret : None , unwind : mir:: UnwindAction :: Unreachable } ,
194
+ ReturnContinuation :: Goto { ret : None , unwind : mir:: UnwindAction :: Unreachable } ,
195
195
)
196
196
}
197
197
@@ -220,7 +220,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
220
220
ExternAbi :: Rust ,
221
221
& [ index, len] ,
222
222
None ,
223
- StackPopCleanup :: Goto { ret : None , unwind } ,
223
+ ReturnContinuation :: Goto { ret : None , unwind } ,
224
224
) ?;
225
225
}
226
226
MisalignedPointerDereference { required, found } => {
@@ -241,7 +241,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
241
241
ExternAbi :: Rust ,
242
242
& [ required, found] ,
243
243
None ,
244
- StackPopCleanup :: Goto { ret : None , unwind } ,
244
+ ReturnContinuation :: Goto { ret : None , unwind } ,
245
245
) ?;
246
246
}
247
247
@@ -254,7 +254,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
254
254
ExternAbi :: Rust ,
255
255
& [ ] ,
256
256
None ,
257
- StackPopCleanup :: Goto { ret : None , unwind } ,
257
+ ReturnContinuation :: Goto { ret : None , unwind } ,
258
258
) ?;
259
259
}
260
260
}
0 commit comments