Skip to content

Commit 814350b

Browse files
committed
Minimal JIT support for ZEND_IN_ARRAY
1 parent 238e189 commit 814350b

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

ext/opcache/jit/zend_jit.c

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2584,15 +2584,7 @@ static int zend_jit(zend_op_array *op_array, zend_ssa *ssa, const zend_op *rt_op
25842584
/* skip */
25852585
} else if ((opline->opcode == ZEND_JMPZ ||
25862586
(opline->opcode == ZEND_JMPNZ)) &&
2587-
((opline-1)->opcode == ZEND_IS_IDENTICAL ||
2588-
(opline-1)->opcode == ZEND_IS_NOT_IDENTICAL ||
2589-
(opline-1)->opcode == ZEND_ISSET_ISEMPTY_VAR ||
2590-
(opline-1)->opcode == ZEND_ISSET_ISEMPTY_STATIC_PROP ||
2591-
(opline-1)->opcode == ZEND_ISSET_ISEMPTY_DIM_OBJ ||
2592-
(opline-1)->opcode == ZEND_ISSET_ISEMPTY_PROP_OBJ ||
2593-
(opline-1)->opcode == ZEND_INSTANCEOF ||
2594-
(opline-1)->opcode == ZEND_TYPE_CHECK ||
2595-
(opline-1)->opcode == ZEND_DEFINED)) {
2587+
zend_is_smart_branch(opline-1)) {
25962588
/* smart branch */
25972589
if (!zend_jit_cond_jmp(&dasm_state, opline + 1, ssa->cfg.blocks[b].successors[0])) {
25982590
goto jit_failure;
@@ -2732,15 +2724,7 @@ static int zend_jit(zend_op_array *op_array, zend_ssa *ssa, const zend_op *rt_op
27322724
}
27332725
break;
27342726
}
2735-
} else if ((opline-1)->opcode == ZEND_IS_IDENTICAL ||
2736-
(opline-1)->opcode == ZEND_IS_NOT_IDENTICAL ||
2737-
(opline-1)->opcode == ZEND_ISSET_ISEMPTY_VAR ||
2738-
(opline-1)->opcode == ZEND_ISSET_ISEMPTY_STATIC_PROP ||
2739-
(opline-1)->opcode == ZEND_ISSET_ISEMPTY_DIM_OBJ ||
2740-
(opline-1)->opcode == ZEND_ISSET_ISEMPTY_PROP_OBJ ||
2741-
(opline-1)->opcode == ZEND_INSTANCEOF ||
2742-
(opline-1)->opcode == ZEND_TYPE_CHECK ||
2743-
(opline-1)->opcode == ZEND_DEFINED) {
2727+
} else if (zend_is_smart_branch(opline-1)) {
27442728
/* smart branch */
27452729
if (!zend_jit_cond_jmp(&dasm_state, opline + 1, ssa->cfg.blocks[b].successors[0])) {
27462730
goto jit_failure;

0 commit comments

Comments
 (0)