Skip to content

Commit 524b134

Browse files
committed
Fixed failure in generator related tests on Mac introduced by 8ef6957
1 parent 01f24bb commit 524b134

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

ext/opcache/jit/zend_jit_ir.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4041,7 +4041,13 @@ static int zend_jit_tail_handler(zend_jit_ctx *jit, const zend_op *opline)
40414041
handler = opline->handler;
40424042
if (GCC_GLOBAL_REGS) {
40434043
ir_TAILCALL(IR_VOID, ir_CONST_FUNC(handler));
4044-
} else if (jit->ssa->cfg.flags & ZEND_FUNC_RECURSIVE_DIRECTLY) {
4044+
} else if ((jit->ssa->cfg.flags & ZEND_FUNC_RECURSIVE_DIRECTLY)
4045+
&& (opline->opcode == ZEND_CATCH
4046+
|| opline->opcode == ZEND_FAST_CALL
4047+
|| opline->opcode == ZEND_FAST_RET
4048+
|| opline->opcode == ZEND_MATCH_ERROR
4049+
|| opline->opcode == ZEND_THROW
4050+
|| opline->opcode == ZEND_VERIFY_NEVER_TYPE)) {
40454051
ref = jit_FP(jit);
40464052
ir_CALL_1(IR_I32, ir_CONST_FC_FUNC(handler), ref);
40474053
ir_RETURN(ir_CONST_I32(1));

0 commit comments

Comments
 (0)