Skip to content

Commit 58805f7

Browse files
committed
Fix merge
1 parent f3018e9 commit 58805f7

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
@@ -17177,7 +17177,9 @@ static int zend_jit_trace_handler(zend_jit_ctx *jit, const zend_op_array *op_arr
1717717177
opline->opcode == ZEND_DO_FCALL_BY_NAME ||
1717817178
opline->opcode == ZEND_DO_FCALL ||
1717917179
opline->opcode == ZEND_GENERATOR_CREATE ||
17180-
opline->opcode == ZEND_INCLUDE_OR_EVAL) {
17180+
opline->opcode == ZEND_INCLUDE_OR_EVAL ||
17181+
/* May enter a simple get hook. */
17182+
opline->opcode == ZEND_FETCH_OBJ_R) {
1718117183

1718217184
ir_ref addr = jit_EG(current_execute_data);
1718317185

0 commit comments

Comments
 (0)