Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 4a7c9ba

Browse files
author
hyd-dev
committed
can_unwind -> caller_can_unwind
1 parent 64044eb commit 4a7c9ba

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

compiler/rustc_mir/src/interpret/terminator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
6969
let old_stack = self.frame_idx();
7070
let old_loc = self.frame().loc;
7171
let func = self.eval_operand(func, None)?;
72-
let (fn_val, abi, can_unwind) = match *func.layout.ty.kind() {
72+
let (fn_val, abi, caller_can_unwind) = match *func.layout.ty.kind() {
7373
ty::FnPtr(sig) => {
7474
let caller_abi = sig.abi();
7575
let fn_ptr = self.read_scalar(&func)?.check_init()?;
@@ -110,7 +110,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
110110
abi,
111111
&args[..],
112112
ret,
113-
if can_unwind {
113+
if caller_can_unwind {
114114
cleanup.map_or(StackPopUnwind::Skip, StackPopUnwind::Cleanup)
115115
} else {
116116
StackPopUnwind::NotAllowed

0 commit comments

Comments
 (0)