Merge branch 'PHP-8.4'

* PHP-8.4:
  Revert "Update IR"

Author: dstogov

ext/opcache/jit/ir/ir.c

@@ -803,9 +803,7 @@ ir_ref ir_proto(ir_ctx *ctx, uint8_t flags, ir_type ret_type, uint32_t params_co
 	proto->flags = flags;
 	proto->ret_type = ret_type;
 	proto->params_count = params_count;
-	if (params_count) {
-		memcpy(proto->param_types, param_types, params_count);
-	}
+	memcpy(proto->param_types, param_types, params_count);
 	return ir_strl(ctx, (const char *)proto, offsetof(ir_proto_t, param_types) + params_count);
 }
 

ext/opcache/jit/ir/ir.h

@@ -854,9 +854,6 @@ void ir_gdb_unregister_all(void);
 bool ir_gdb_present(void);
 
 /* IR load API (implementation in ir_load.c) */
-#define IR_RESOLVE_SYM_ADD_THUNK (1<<0)
-#define IR_RESOLVE_SYM_SILENT    (1<<1)
-
 struct _ir_loader {
 	uint32_t default_func_flags;
 	bool (*init_module)       (ir_loader *loader, const char *name, const char *filename, const char *target);
@@ -873,7 +870,7 @@ struct _ir_loader {
 	bool (*sym_data_end)      (ir_loader *loader, uint32_t flags);
 	bool (*func_init)         (ir_loader *loader, ir_ctx *ctx, const char *name);
 	bool (*func_process)      (ir_loader *loader, ir_ctx *ctx, const char *name);
-	void*(*resolve_sym_name)  (ir_loader *loader, const char *name, uint32_t flags);
+	void*(*resolve_sym_name)  (ir_loader *loader, const char *name, bool add_thunk);
 	bool (*has_sym)           (ir_loader *loader, const char *name);
 	bool (*add_sym)           (ir_loader *loader, const char *name, void *addr);
 };

ext/opcache/jit/ir/ir_aarch64.dasc

@@ -4366,15 +4366,11 @@ static void ir_emit_va_arg(ir_ctx *ctx, ir_ref def, ir_insn *insn)
 	ir_backend_data *data = ctx->data;
 	dasm_State **Dst = &data->dasm_state;
 	ir_type type = insn->type;
-	ir_reg def_reg = IR_REG_NUM(ctx->regs[def][0]);
+	ir_reg def_reg = ctx->regs[def][0];
 	ir_reg op2_reg = ctx->regs[def][2];
 	ir_reg tmp_reg = ctx->regs[def][3];
 	int32_t offset;
 
-	if (ctx->use_lists[def].count == 1) {
-		/* dead load */
-		return;
-	}
 	IR_ASSERT(def_reg != IR_REG_NONE && tmp_reg != IR_REG_NONE);
 	if (op2_reg != IR_REG_NONE) {
 		if (IR_REG_SPILLED(op2_reg)) {
@@ -4398,15 +4394,11 @@ static void ir_emit_va_arg(ir_ctx *ctx, ir_ref def, ir_insn *insn)
 	ir_backend_data *data = ctx->data;
 	dasm_State **Dst = &data->dasm_state;
 	ir_type type = insn->type;
-	ir_reg def_reg = IR_REG_NUM(ctx->regs[def][0]);
+	ir_reg def_reg = ctx->regs[def][0];
 	ir_reg op2_reg = ctx->regs[def][2];
 	ir_reg tmp_reg = ctx->regs[def][3];
 	int32_t offset;
 
-	if (ctx->use_lists[def].count == 1) {
-		/* dead load */
-		return;
-	}
 	IR_ASSERT(def_reg != IR_REG_NONE && tmp_reg != IR_REG_NONE);
 	if (op2_reg != IR_REG_NONE) {
 		if (IR_REG_SPILLED(op2_reg)) {
@@ -4943,28 +4935,6 @@ static void ir_emit_tailcall(ir_ctx *ctx, ir_ref def, ir_insn *insn)
 		return;
 	}
 
-	/* Move op2 to a tmp register before epilogue if it's in
-	 * used_preserved_regs, because it will be overridden. */
-
-	ir_reg op2_reg = IR_REG_NONE;
-	if (!IR_IS_CONST_REF(insn->op2)) {
-		op2_reg = ctx->regs[def][2];
-		IR_ASSERT(op2_reg != IR_REG_NONE);
-
-		if (IR_REG_SPILLED(op2_reg)) {
-			op2_reg = IR_REG_INT_TMP;
-			ir_emit_load(ctx, IR_ADDR, op2_reg, insn->op2);
-		} else if (IR_REGSET_IN((ir_regset)ctx->used_preserved_regs, IR_REG_NUM(op2_reg))) {
-			ir_reg orig_op2_reg = op2_reg;
-			op2_reg = IR_REG_INT_TMP;
-
-			ir_type type = ctx->ir_base[insn->op2].type;
-			| ASM_REG_REG_OP mov, type, op2_reg, IR_REG_NUM(orig_op2_reg)
-		} else {
-			op2_reg = IR_REG_NUM(op2_reg);
-		}
-	}
-
 	ir_emit_epilogue(ctx);
 
 	if (IR_IS_CONST_REF(insn->op2)) {
@@ -4977,8 +4947,13 @@ static void ir_emit_tailcall(ir_ctx *ctx, ir_ref def, ir_insn *insn)
 			|	br Rx(IR_REG_INT_TMP)
 		}
     } else {
+		ir_reg op2_reg = ctx->regs[def][2];
+
 		IR_ASSERT(op2_reg != IR_REG_NONE);
-		IR_ASSERT(!IR_REGSET_IN((ir_regset)ctx->used_preserved_regs, op2_reg));
+		if (IR_REG_SPILLED(op2_reg)) {
+			op2_reg = IR_REG_NUM(op2_reg);
+			ir_emit_load(ctx, IR_ADDR, op2_reg, insn->op2);
+		}
 		|	br Rx(op2_reg)
     }
 }