diff options
author | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-13 06:55:35 +0000 |
---|---|---|
committer | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-13 06:55:35 +0000 |
commit | 088df9c8c26bcd7ad4de6637d9e734c26e7b72a0 (patch) | |
tree | 65484f1480f7b1f0a01abcd7e6a4c468847623cd | |
parent | 30f71f4768e0babc60f5be6ca235d2c40268bc27 (diff) | |
download | ruby-088df9c8c26bcd7ad4de6637d9e734c26e7b72a0.tar.gz |
Revert "GET_CFP and ec->cfp are different"
This reverts commit 30f71f4768e0babc60f5be6ca235d2c40268bc27.
I've also overlooked we're doing RESTORE_REGS()...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | vm_insnhelper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 95612453e7..1b0dbde832 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -3636,12 +3636,12 @@ vm_sendish( frame may have stack values in the local variables and the cancelling the caller frame will purge them. But directly calling mjit_exec is faster... */ - if (ec->cfp->iseq->body->catch_except_p) { - VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH); + if (GET_ISEQ()->body->catch_except_p) { + VM_ENV_FLAGS_SET(GET_EP(), VM_FRAME_FLAG_FINISH); return vm_exec(ec, true); } else if ((val = mjit_exec(ec)) == Qundef) { - VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH); + VM_ENV_FLAGS_SET(GET_EP(), VM_FRAME_FLAG_FINISH); return vm_exec(ec, false); } else { |