Merge branch 'PHP-8.0' into PHP-8.1

dstogov · dstogov · commit 55f1db6e5c70 · 2022-02-11T11:10:38.000+03:00
* PHP-8.0:
  Tracing JIT: Fixed incorrect deoptimization info
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -4157,7 +4157,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)) {

Original file line number	Diff line number	Diff line change
`@@ -4157,7 +4157,7 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`4157`	`4157`	`}`
`4158`	`4158`	`info &= ~MAY_BE_GUARD;`
`4159`	`4159`	`ssa->var_info[phi->ssa_var].type = info;`
`4160`		`- SET_STACK_TYPE(stack, i, concrete_type(info), 1);`
	`4160`	`+ SET_STACK_TYPE(stack, phi->var, concrete_type(info), 1);`
`4161`	`4161`	`}`
`4162`	`4162`	`SET_STACK_REG_EX(stack, phi->var, ival->reg, ZREG_LOAD);`
`4163`	`4163`	`if (!zend_jit_load_var(&dasm_state, ssa->var_info[phi->ssa_var].type, ssa->vars[phi->ssa_var].var, ival->reg)) {`