@@ -2584,15 +2584,7 @@ static int zend_jit(zend_op_array *op_array, zend_ssa *ssa, const zend_op *rt_op
2584
2584
/* skip */
2585
2585
} else if ((opline -> opcode == ZEND_JMPZ ||
2586
2586
(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 )) {
2596
2588
/* smart branch */
2597
2589
if (!zend_jit_cond_jmp (& dasm_state , opline + 1 , ssa -> cfg .blocks [b ].successors [0 ])) {
2598
2590
goto jit_failure ;
@@ -2732,15 +2724,7 @@ static int zend_jit(zend_op_array *op_array, zend_ssa *ssa, const zend_op *rt_op
2732
2724
}
2733
2725
break ;
2734
2726
}
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 )) {
2744
2728
/* smart branch */
2745
2729
if (!zend_jit_cond_jmp (& dasm_state , opline + 1 , ssa -> cfg .blocks [b ].successors [0 ])) {
2746
2730
goto jit_failure ;
0 commit comments