Skip to content

Commit 8e6f1ef

Browse files
committed
Merge branch 'PHP-8.6'
* PHP-8.6: Fix merge
2 parents 35658d1 + 29af2f1 commit 8e6f1ef

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

‎ext/opcache/jit/zend_jit_ir.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17309,7 +17309,9 @@ static int zend_jit_trace_handler(zend_jit_ctx *jit, const zend_op_array *op_arr
1730917309
opline->opcode == ZEND_DO_FCALL_BY_NAME ||
1731017310
opline->opcode == ZEND_DO_FCALL ||
1731117311
opline->opcode == ZEND_GENERATOR_CREATE ||
17312-
opline->opcode == ZEND_INCLUDE_OR_EVAL) {
17312+
opline->opcode == ZEND_INCLUDE_OR_EVAL ||
17313+
/* May enter a simple get hook. */
17314+
opline->opcode == ZEND_FETCH_OBJ_R) {
1731317315

1731417316
ir_ref addr = jit_EG(current_execute_data);
1731517317

0 commit comments

Comments
 (0)