Skip to content

Commit a0ce529

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fixed GH-12482: Abortion with tracing JIT
2 parents 0c22276 + 9668077 commit a0ce529

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ext/opcache/jit/zend_jit_arm64.dasc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14930,7 +14930,7 @@ static bool zend_jit_fetch_indirect_var(dasm_State **Dst, const zend_op *opline,
1493014930
if (opline->op1_type != IS_VAR ||
1493114931
(opline-1)->result_type != IS_VAR ||
1493214932
(opline-1)->result.var != opline->op1.var ||
14933-
(opline-1)->op2_type == IS_VAR ||
14933+
(opline-1)->op1_type == IS_VAR ||
1493414934
(opline-1)->op2_type == IS_TMP_VAR) {
1493514935
| GET_ZVAL_PTR FCARG1x, var_addr, TMP1
1493614936
} else if ((opline-1)->opcode == ZEND_FETCH_DIM_W || (opline-1)->opcode == ZEND_FETCH_DIM_RW) {

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15904,7 +15904,7 @@ static bool zend_jit_fetch_indirect_var(dasm_State **Dst, const zend_op *opline,
1590415904
if (opline->op1_type != IS_VAR ||
1590515905
(opline-1)->result_type != IS_VAR ||
1590615906
(opline-1)->result.var != opline->op1.var ||
15907-
(opline-1)->op2_type == IS_VAR ||
15907+
(opline-1)->op1_type == IS_VAR ||
1590815908
(opline-1)->op2_type == IS_TMP_VAR) {
1590915909
| GET_ZVAL_PTR FCARG1a, var_addr
1591015910
} else if ((opline-1)->opcode == ZEND_FETCH_DIM_W || (opline-1)->opcode == ZEND_FETCH_DIM_RW) {

0 commit comments

Comments
 (0)