Skip to content

Commit 04393f2

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Fixed inconsistent VM stack state
2 parents 849b9e2 + bd321df commit 04393f2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10092,7 +10092,10 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
1009210092
if (JIT_G(trigger) != ZEND_JIT_ON_HOT_TRACE ||
1009310093
!JIT_G(current_frame) ||
1009410094
!JIT_G(current_frame)->call ||
10095-
!TRACE_FRAME_IS_NESTED(JIT_G(current_frame)->call)) {
10095+
!TRACE_FRAME_IS_NESTED(JIT_G(current_frame)->call) ||
10096+
prev_opline->opcode == ZEND_SEND_UNPACK ||
10097+
prev_opline->opcode == ZEND_SEND_ARRAY ||
10098+
prev_opline->opcode == ZEND_CHECK_UNDEF_ARGS) {
1009610099

1009710100
| // zend_vm_stack_free_call_frame(call);
1009810101
| test byte [RX + offsetof(zend_execute_data, This.u1.type_info) + 2], (ZEND_CALL_ALLOCATED >> 16)

0 commit comments

Comments
 (0)