From 26a11ae77107884ba53592d239a75c2028e244a0 Mon Sep 17 00:00:00 2001 From: k0kubun Date: Thu, 13 Sep 2018 07:12:07 +0000 Subject: Revert "vm_insnhelper.h: simplify EXEC_EC_CFP implementation" This reverts commit r64711, because EXEC_EC_CFP on JIT-ed code does not call jit_func with the patch when catch_except_p is true. It wasn't intentional. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64730 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- mjit.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'mjit.h') diff --git a/mjit.h b/mjit.h index 17148fcdc6..eee3a8badb 100644 --- a/mjit.h +++ b/mjit.h @@ -89,7 +89,7 @@ mjit_target_iseq_p(struct rb_iseq_constant_body *body) /* Try to execute the current iseq in ec. Use JIT code if it is ready. If it is not, add ISEQ to the compilation queue and return Qundef. */ static inline VALUE -mjit_exec(rb_execution_context_t *ec, int guard_except_p) +mjit_exec(rb_execution_context_t *ec) { const rb_iseq_t *iseq; struct rb_iseq_constant_body *body; @@ -102,8 +102,6 @@ mjit_exec(rb_execution_context_t *ec, int guard_except_p) iseq = ec->cfp->iseq; body = iseq->body; total_calls = ++body->total_calls; - if (guard_except_p && body->catch_except_p) - return Qundef; func = body->jit_func; if (UNLIKELY((uintptr_t)func <= (uintptr_t)LAST_JIT_ISEQ_FUNC)) { -- cgit v1.2.3