1
0
mirror of https://github.com/php/php-src.git synced 2026-04-20 14:31:06 +02:00

Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Tracing JIT: Fixed incorrect deoptimization info
This commit is contained in:
Dmitry Stogov
2022-02-11 11:10:38 +03:00

View File

@@ -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)) {