Merge branch 'PHP-8.1'

* PHP-8.1:
  Tracing JIT: Fixed incorrect deoptimization info
  Tracing JIT: Fixed incorrect deoptimization info

Author: dstogov

ext/opcache/jit/zend_jit_trace.c

@@ -4168,7 +4168,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 							}
 							info &= ~MAY_BE_GUARD;
 							ssa->var_info[phi->ssa_var].type = info;
-							SET_STACK_TYPE(stack, i, concrete_type(info), 1);
+							SET_STACK_TYPE(stack, phi->var, concrete_type(info), 1);
 						}
 						SET_STACK_REG_EX(stack, phi->var, ival->reg, ZREG_LOAD);
 						if (!zend_jit_load_var(&dasm_state, ssa->var_info[phi->ssa_var].type, ssa->vars[phi->ssa_var].var, ival->reg)) {

ext/opcache/tests/jit/reg_alloc_008.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Register Alloction 008: Incorrect deoptimization code
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=1M
+--FILE--
+<?php
+function foo($a) {
+    for($i=0; $i<1; $i++)
+          $a=$y / $a = $a + $a != ($a);
+}
+foo(7);
+?>
+--EXPECTF--
+Warning: Undefined variable $y in %sreg_alloc_008.php on line 4