kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Revert "GET_CFP and ec->cfp are different"

Browse source 
This reverts commit 30f71f4768.

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
This commit is contained in:
k0kubun 2019-04-13 06:55:35 +00:00
parent 30f71f4768
commit 088df9c8c2
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
vm_insnhelper.c
View file

@ -3636,12 +3636,12 @@ vm_sendish(
frame may have stack values in the local variables and the frame may have stack values in the local variables and the
cancelling the caller frame will purge them. But directly cancelling the caller frame will purge them. But directly
calling mjit_exec is faster... */ calling mjit_exec is faster... */
if (ec->cfp->iseq->body->catch_except_p) { if (GET_ISEQ()->body->catch_except_p) {
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, true); return vm_exec(ec, true);
} }
else if ((val = mjit_exec(ec)) == Qundef) { 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); return vm_exec(ec, false);
} }
else { else {