Move some IR_CHECK_CALLING_CONV() calls into ir_check()

Author: arnaud-lb

ext/opcache/jit/ir/ir_check.c

@@ -94,6 +94,7 @@ bool ir_check(const ir_ctx *ctx)
 	uint32_t flags;
 	bool ok = 1;
 
+	IR_CHECK_CALLING_CONV(ctx->flags);
 	if ((ctx->flags & (IR_VARARG_FUNC|IR_PRESERVE_NONE_FUNC)) == (IR_VARARG_FUNC|IR_PRESERVE_NONE_FUNC)) {
 		fprintf(stderr, "IR_VARARG_FUNC and IR_PRESERVE_NONE_FUNC flags are mutually exclusive (preserve_none does not support var args)\n");
 		ok = 0;

ext/opcache/jit/ir/ir_emit.c

@@ -191,8 +191,6 @@ static ir_reg ir_get_param_reg(const ir_ctx *ctx, ir_ref ref)
 	const int8_t *int_reg_params = _ir_int_reg_params;
 	const int8_t *fp_reg_params = _ir_fp_reg_params;
 
-	IR_CHECK_CALLING_CONV(ctx->flags);
-
 #ifdef IR_HAVE_FASTCALL
 	if (sizeof(void*) == 4 && (ctx->flags & IR_FASTCALL_FUNC)) {
 		int_reg_params_count = IR_REG_INT_FCARGS;
@@ -257,8 +255,6 @@ static int ir_get_args_regs(const ir_ctx *ctx, const ir_insn *insn, int8_t *regs
 	const int8_t *int_reg_params = _ir_int_reg_params;
 	const int8_t *fp_reg_params = _ir_fp_reg_params;
 
-	IR_CHECK_CALLING_CONV(ctx->flags);
-
 #ifdef IR_HAVE_FASTCALL
 	if (sizeof(void*) == 4 && ir_is_fastcall(ctx, insn)) {
 		int_reg_params_count = IR_REG_INT_FCARGS;
@@ -268,7 +264,7 @@ static int ir_get_args_regs(const ir_ctx *ctx, const ir_insn *insn, int8_t *regs
 	}
 #endif
 #ifdef IR_HAVE_PRESERVE_NONE
-	if (ctx->flags & IR_PRESERVE_NONE_FUNC) {
+	if (ir_is_preserve_none(ctx, insn)) {
 		int_reg_params_count = IR_REG_INT_PNARGS;
 		int_reg_params = _ir_int_pn_reg_params;
 	}

ext/opcache/jit/ir/ir_x86.dasc

@@ -10145,8 +10145,6 @@ static void ir_emit_load_params(ir_ctx *ctx)
 	const int8_t *fp_reg_params = _ir_fp_reg_params;
 	int32_t stack_offset = 0;
 
-	IR_CHECK_CALLING_CONV(ctx->flags);
-
 #ifdef IR_TARGET_X86
 	if (sizeof(void*) == 4 && (ctx->flags & IR_FASTCALL_FUNC)) {
 		int_reg_params_count = IR_REG_INT_FCARGS;
@@ -10279,8 +10277,6 @@ static void ir_fix_param_spills(ir_ctx *ctx)
 	int32_t stack_start = 0;
 	int32_t stack_offset = 0;
 
-	IR_CHECK_CALLING_CONV(ctx->flags);
-
 #ifdef IR_TARGET_X86
 	if (sizeof(void*) == 4 && (ctx->flags & IR_FASTCALL_FUNC)) {
 		int_reg_params_count = IR_REG_INT_FCARGS;