Skip to content

Commit 9668077

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fixed GH-12482: Abortion with tracing JIT
2 parents fed7937 + 76c41d2 commit 9668077

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
@@ -14885,7 +14885,7 @@ static bool zend_jit_fetch_indirect_var(dasm_State **Dst, const zend_op *opline,
1488514885
if (opline->op1_type != IS_VAR ||
1488614886
(opline-1)->result_type != IS_VAR ||
1488714887
(opline-1)->result.var != opline->op1.var ||
14888-
(opline-1)->op2_type == IS_VAR ||
14888+
(opline-1)->op1_type == IS_VAR ||
1488914889
(opline-1)->op2_type == IS_TMP_VAR) {
1489014890
| GET_ZVAL_PTR FCARG1x, var_addr, TMP1
1489114891
} 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
@@ -15855,7 +15855,7 @@ static bool zend_jit_fetch_indirect_var(dasm_State **Dst, const zend_op *opline,
1585515855
if (opline->op1_type != IS_VAR ||
1585615856
(opline-1)->result_type != IS_VAR ||
1585715857
(opline-1)->result.var != opline->op1.var ||
15858-
(opline-1)->op2_type == IS_VAR ||
15858+
(opline-1)->op1_type == IS_VAR ||
1585915859
(opline-1)->op2_type == IS_TMP_VAR) {
1586015860
| GET_ZVAL_PTR FCARG1a, var_addr
1586115861
} else if ((opline-1)->opcode == ZEND_FETCH_DIM_W || (opline-1)->opcode == ZEND_FETCH_DIM_RW) {

0 commit comments

Comments
 (0)