about summary refs log tree commit diff
diff options
context:
space:
mode:
authorhyd-dev <yd-huang@outlook.com>2021-05-25 03:47:24 +0800
committerhyd-dev <yd-huang@outlook.com>2021-05-25 03:47:24 +0800
commit4a7c9ba6e3a250dc899af9b401d2db45d4c2ea7e (patch)
tree4c86821d327ccfed8e1c05190a891f66ab701184
parent64044eb2371d955c2e854f849eaccb45dbd33c4a (diff)
downloadrust-4a7c9ba6e3a250dc899af9b401d2db45d4c2ea7e.tar.gz
rust-4a7c9ba6e3a250dc899af9b401d2db45d4c2ea7e.zip
`can_unwind` -> `caller_can_unwind`
-rw-r--r--compiler/rustc_mir/src/interpret/terminator.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_mir/src/interpret/terminator.rs b/compiler/rustc_mir/src/interpret/terminator.rs
index 9cbf94dbadf..305d41f5eeb 100644
--- a/compiler/rustc_mir/src/interpret/terminator.rs
+++ b/compiler/rustc_mir/src/interpret/terminator.rs
@@ -69,7 +69,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                 let old_stack = self.frame_idx();
                 let old_loc = self.frame().loc;
                 let func = self.eval_operand(func, None)?;
-                let (fn_val, abi, can_unwind) = match *func.layout.ty.kind() {
+                let (fn_val, abi, caller_can_unwind) = match *func.layout.ty.kind() {
                     ty::FnPtr(sig) => {
                         let caller_abi = sig.abi();
                         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> {
                     abi,
                     &args[..],
                     ret,
-                    if can_unwind {
+                    if caller_can_unwind {
                         cleanup.map_or(StackPopUnwind::Skip, StackPopUnwind::Cleanup)
                     } else {
                         StackPopUnwind::NotAllowed