Skip to content

Commit 2b7035e

Browse files
committed
Fixed tracing JIT for VM without global register variables
1 parent 236ddc5 commit 2b7035e

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

ext/opcache/jit/zend_jit_vm_helpers.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ void ZEND_FASTCALL zend_jit_copy_extra_args_helper(EXECUTE_DATA_D)
123123
/* Skip useless ZEND_RECV and ZEND_RECV_INIT opcodes */
124124
#ifdef HAVE_GCC_GLOBAL_REGS
125125
opline += first_extra_arg;
126+
#else
127+
EX(opline) += first_extra_arg;
126128
#endif
127129
}
128130

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3180,7 +3180,8 @@ static int zend_jit_trace_handler(dasm_State **Dst, const zend_op_array *op_arra
31803180
opline->opcode == ZEND_RETURN_BY_REF ||
31813181
opline->opcode == ZEND_DO_UCALL ||
31823182
opline->opcode == ZEND_DO_FCALL_BY_NAME ||
3183-
opline->opcode == ZEND_DO_FCALL) {
3183+
opline->opcode == ZEND_DO_FCALL ||
3184+
opline->opcode == ZEND_GENERATOR_CREATE) {
31843185
| MEM_OP2_2_ZTS mov, FP, aword, executor_globals, current_execute_data, r0
31853186
}
31863187
}

0 commit comments

Comments
 (0)