Skip to content

Commit 76c41d2

Browse files
committed
Fixed GH-12482: Abortion with tracing JIT
1 parent e270ee3 commit 76c41d2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ext/opcache/jit/zend_jit_arm64.dasc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14932,7 +14932,7 @@ static bool zend_jit_fetch_indirect_var(dasm_State **Dst, const zend_op *opline,
1493214932
if (opline->op1_type != IS_VAR ||
1493314933
(opline-1)->result_type != IS_VAR ||
1493414934
(opline-1)->result.var != opline->op1.var ||
14935-
(opline-1)->op2_type == IS_VAR ||
14935+
(opline-1)->op1_type == IS_VAR ||
1493614936
(opline-1)->op2_type == IS_TMP_VAR) {
1493714937
| GET_ZVAL_PTR FCARG1x, var_addr, TMP1
1493814938
} else if ((opline-1)->opcode == ZEND_FETCH_DIM_W || (opline-1)->opcode == ZEND_FETCH_DIM_RW) {

ext/opcache/jit/zend_jit_x86.dasc

+1-1
Original file line numberDiff line numberDiff line change
@@ -15885,7 +15885,7 @@ static bool zend_jit_fetch_indirect_var(dasm_State **Dst, const zend_op *opline,
1588515885
if (opline->op1_type != IS_VAR ||
1588615886
(opline-1)->result_type != IS_VAR ||
1588715887
(opline-1)->result.var != opline->op1.var ||
15888-
(opline-1)->op2_type == IS_VAR ||
15888+
(opline-1)->op1_type == IS_VAR ||
1588915889
(opline-1)->op2_type == IS_TMP_VAR) {
1589015890
| GET_ZVAL_PTR FCARG1a, var_addr
1589115891
} else if ((opline-1)->opcode == ZEND_FETCH_DIM_W || (opline-1)->opcode == ZEND_FETCH_DIM_RW) {

0 commit comments

Comments
 (0)