Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Save register before throwing undef var notice

Author: nikic

ext/opcache/jit/zend_jit_x86.dasc

@@ -6427,6 +6427,9 @@ static int zend_jit_assign_dim_op(dasm_State **Dst, const zend_op *opline, uint3
 			|	CMP_ZVAL_TYPE op1_addr, IS_NULL
 			|	jg >7
 		}
+		if (Z_REG(op1_addr) != ZREG_FP) {
+			|	mov T1, Ra(Z_REG(op1_addr)) // save
+		}
 		if (op1_info & MAY_BE_UNDEF) {
 			if (op1_info & MAY_BE_NULL) {
 				|	IF_NOT_ZVAL_TYPE op1_addr, IS_UNDEF, >1
@@ -6437,9 +6440,6 @@ static int zend_jit_assign_dim_op(dasm_State **Dst, const zend_op *opline, uint3
 			|1:
 		}
 		|	// ZVAL_ARR(container, zend_new_array(8));
-		if (Z_REG(op1_addr) != ZREG_FP) {
-			|	mov T1, Ra(Z_REG(op1_addr)) // save
-		}
 		|	EXT_CALL _zend_new_array_0, r0
 		if (Z_REG(op1_addr) != ZREG_FP) {
 			|	mov Ra(Z_REG(op1_addr)), T1 // restore

ext/opcache/tests/jit/assign_dim_op_002.phpt

@@ -0,0 +1,15 @@
+--TEST--
+JIT ASSIGN_DIM_OP: Undefined variable
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=1M
+--EXTENSIONS--
+opcache
+--FILE--
+<?php
+$a[] &= 1;
+?>
+--EXPECTF--
+Warning: Undefined variable $a in %s on line %d