Merge branch 'PHP-8.4'

dstogov · dstogov · commit 83ccc97d80ee · 2025-09-22T20:14:49.000+03:00
* PHP-8.4:
  Update IR
diff --git a/ext/opcache/jit/ir/ir_aarch64.dasc b/ext/opcache/jit/ir/ir_aarch64.dasc
@@ -4457,7 +4457,7 @@ static void ir_emit_va_arg(ir_ctx *ctx, ir_ref def, ir_insn *insn)
 	} else {
 		IR_ASSERT(ir_rule(ctx, insn->op2) == IR_STATIC_ALLOCA);
 		op2_reg = (ctx->flags & IR_USE_FRAME_POINTER) ? IR_REG_FRAME_POINTER : IR_REG_STACK_POINTER;
-		offset = ir_local_offset(ct, &ctx->ir_base[insn->op2]);
+		offset = ir_local_offset(ctx, &ctx->ir_base[insn->op2]);
 	}
 	|	ldr Rx(tmp_reg), [Rx(op2_reg), #offset]
 	ir_emit_load_mem(ctx, type, def_reg, IR_MEM_BO(tmp_reg, 0));

Original file line number	Diff line number	Diff line change
`@@ -4457,7 +4457,7 @@ static void ir_emit_va_arg(ir_ctx ctx, ir_ref def, ir_insn insn)`
`4457`	`4457`	`} else {`
`4458`	`4458`	`IR_ASSERT(ir_rule(ctx, insn->op2) == IR_STATIC_ALLOCA);`
`4459`	`4459`	`op2_reg = (ctx->flags & IR_USE_FRAME_POINTER) ? IR_REG_FRAME_POINTER : IR_REG_STACK_POINTER;`
`4460`		`- offset = ir_local_offset(ct, &ctx->ir_base[insn->op2]);`
	`4460`	`+ offset = ir_local_offset(ctx, &ctx->ir_base[insn->op2]);`
`4461`	`4461`	`}`
`4462`	`4462`	`\| ldr Rx(tmp_reg), [Rx(op2_reg), #offset]`
`4463`	`4463`	`ir_emit_load_mem(ctx, type, def_reg, IR_MEM_BO(tmp_reg, 0));`