Skip to content

Commit 07a9c25

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix Nightly workflow Symfony assertion (ir_ra.c:326: ir_fix_live_range: Assertion `ival && p->start == old_start' failed) (#19458)
2 parents 4d74dd0 + 47f9f3a commit 07a9c25

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

ext/opcache/jit/zend_jit_ir.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14658,6 +14658,13 @@ static int zend_jit_assign_obj(zend_jit_ctx *jit,
1465814658
ir_ref slow_inputs = IR_UNUSED;
1465914659
uint32_t res_info = RES_INFO();
1466014660

14661+
if (Z_MODE(val_addr) == IS_REG
14662+
&& Z_LOAD(val_addr)
14663+
&& jit->ra[Z_SSA_VAR(val_addr)].ref == IR_NULL) {
14664+
/* Force load */
14665+
zend_jit_use_reg(jit, val_addr);
14666+
}
14667+
1466114668
if (val_addr != val_def_addr && val_def_addr) {
1466214669
if (!zend_jit_update_regs(jit, (opline+1)->op1.var, val_addr, val_def_addr, val_info)) {
1466314670
return 0;

0 commit comments

Comments
 (0)