Merge branch 'PHP-8.1' into PHP-8.2

dstogov · dstogov · commit 6567d4972692 · 2022-10-24T20:43:18.000+03:00
* PHP-8.1: opcache: fix syntax error introduced in 261a08a (#9821)
diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc
@@ -11418,7 +11418,7 @@ static int zend_jit_fetch_dim(dasm_State    **Dst,
 		|.cold_code
 		|2:
 		|	SET_EX_OPLINE opline, REG0
-		if (if (opline->opcode != ZEND_FETCH_DIM_RW) {
+		if (opline->opcode != ZEND_FETCH_DIM_RW) {
 			|	EXT_CALL zend_jit_prepare_assign_dim_ref, REG0
 		}
 		|	mov FCARG1x, RETVALx

Original file line number	Diff line number	Diff line change
`@@ -11418,7 +11418,7 @@ static int zend_jit_fetch_dim(dasm_State **Dst,`
`11418`	`11418`	`\|.cold_code`
`11419`	`11419`	`\|2:`
`11420`	`11420`	`\| SET_EX_OPLINE opline, REG0`
`11421`		`- if (if (opline->opcode != ZEND_FETCH_DIM_RW) {`
	`11421`	`+ if (opline->opcode != ZEND_FETCH_DIM_RW) {`
`11422`	`11422`	`\| EXT_CALL zend_jit_prepare_assign_dim_ref, REG0`
`11423`	`11423`	`}`
`11424`	`11424`	`\| mov FCARG1x, RETVALx`