Skip to content

Commit 41d2b74

Browse files
committed
Merge branch 'PHP-8.1'
* PHP-8.1: Tracing JIT: Record information about types of defined object properties and use it to optimize code for ASSIGN_OBJ_OP, PRE/POST_INC/DEC_OBJ and FETCH_OBJ_R/IS
2 parents b7409d3 + f2ceb63 commit 41d2b74

File tree

5 files changed

+471
-300
lines changed

5 files changed

+471
-300
lines changed

ext/opcache/jit/zend_jit.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3163,7 +3163,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
31633163
}
31643164
if (!zend_jit_incdec_obj(&dasm_state, opline, op_array, ssa, ssa_op,
31653165
op1_info, op1_addr,
3166-
0, ce, ce_is_instanceof, 0, NULL,
3166+
0, ce, ce_is_instanceof, 0, NULL, IS_UNKNOWN,
31673167
zend_may_throw(opline, ssa_op, op_array, ssa))) {
31683168
goto jit_failure;
31693169
}
@@ -3210,7 +3210,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
32103210
}
32113211
if (!zend_jit_assign_obj_op(&dasm_state, opline, op_array, ssa, ssa_op,
32123212
op1_info, op1_addr, OP1_DATA_INFO(), OP1_DATA_RANGE(),
3213-
0, ce, ce_is_instanceof, 0, NULL,
3213+
0, ce, ce_is_instanceof, 0, NULL, IS_UNKNOWN,
32143214
zend_may_throw(opline, ssa_op, op_array, ssa))) {
32153215
goto jit_failure;
32163216
}
@@ -3250,7 +3250,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
32503250
}
32513251
if (!zend_jit_assign_obj(&dasm_state, opline, op_array, ssa, ssa_op,
32523252
op1_info, op1_addr, OP1_DATA_INFO(),
3253-
0, ce, ce_is_instanceof, 0, NULL,
3253+
0, ce, ce_is_instanceof, 0, NULL, IS_UNKNOWN,
32543254
zend_may_throw(opline, ssa_op, op_array, ssa))) {
32553255
goto jit_failure;
32563256
}
@@ -3758,6 +3758,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
37583758
}
37593759
if (!zend_jit_fetch_obj(&dasm_state, opline, op_array, ssa, ssa_op,
37603760
op1_info, op1_addr, 0, ce, ce_is_instanceof, 0, 0, NULL,
3761+
IS_UNKNOWN,
37613762
zend_may_throw(opline, ssa_op, op_array, ssa))) {
37623763
goto jit_failure;
37633764
}

0 commit comments

Comments
 (0)