Preserve none fixes

Author: arnaud-lb

ext/opcache/jit/ir/ir_ra.c

@@ -4100,17 +4100,24 @@ static void assign_regs(ir_ctx *ctx)
 		} while (ival);
 	}
 
+	ir_regset preserved;
+	if (ctx->flags & IR_PRESERVE_NONE_FUNC) {
+		preserved = IR_REGSET_PNPRESERVED;
+	} else {
+		preserved = IR_REGSET_PRESERVED;
+	}
+
 	if (ctx->fixed_stack_frame_size != -1) {
 		ctx->used_preserved_regs = (ir_regset)ctx->fixed_save_regset;
-		if (IR_REGSET_DIFFERENCE(IR_REGSET_INTERSECTION(used_regs, IR_REGSET_PRESERVED),
+		if (IR_REGSET_DIFFERENCE(IR_REGSET_INTERSECTION(used_regs, preserved),
 			ctx->used_preserved_regs)) {
 			// TODO: Preserved reg and fixed frame conflict ???
 			// IR_ASSERT(0 && "Preserved reg and fixed frame conflict");
 		}
 	} else {
 		ctx->used_preserved_regs = IR_REGSET_UNION((ir_regset)ctx->fixed_save_regset,
-			IR_REGSET_DIFFERENCE(IR_REGSET_INTERSECTION(used_regs, IR_REGSET_PRESERVED),
-				(ctx->flags & IR_FUNCTION) ? (ir_regset)ctx->fixed_regset : IR_REGSET_PRESERVED));
+			IR_REGSET_DIFFERENCE(IR_REGSET_INTERSECTION(used_regs, preserved),
+				(ctx->flags & IR_FUNCTION) ? (ir_regset)ctx->fixed_regset : preserved));
 	}
 
 	ir_fix_stack_frame(ctx);

ext/opcache/jit/ir/ir_x86.h

@@ -156,6 +156,7 @@ enum _ir_reg {
 # define IR_REG_FP_RET1  IR_REG_XMM0
 # define IR_REG_INT_ARGS 6
 # define IR_REG_FP_ARGS  8
+# define IR_MAX_REG_ARGS 20 /* IR_REG_INT_PNARGS + IR_REG_FP_ARGS */
 # define IR_REG_INT_ARG1 IR_REG_RDI
 # define IR_REG_INT_ARG2 IR_REG_RSI
 # define IR_REG_INT_ARG3 IR_REG_RDX
@@ -190,37 +191,36 @@ enum _ir_reg {
 	| IR_REGSET(IR_REG_RCX) | IR_REGSET(IR_REG_R8) | IR_REGSET(IR_REG_R9) \
 	| IR_REGSET_INTERVAL(IR_REG_XMM0, IR_REG_XMM7))
 
-# if __has_attribute(preserve_none)
-
-#  define IR_HAVE_PRESERVE_NONE 1
+# define IR_HAVE_PRESERVE_NONE 1
 
 /* https://github.com/llvm/llvm-project/blob/68bfe91b5a34f80dbcc4f0a7fa5d7aa1cdf959c2/llvm/lib/Target/X86/X86CallingConv.td#L1029 */
-#  define IR_REG_INT_PNARGS  12
-#  define IR_REG_INT_PNARG1  IR_REG_R12
-#  define IR_REG_INT_PNARG2  IR_REG_R13
-#  define IR_REG_INT_PNARG3  IR_REG_R14
-#  define IR_REG_INT_PNARG4  IR_REG_R15
-#  define IR_REG_INT_PNARG5  IR_REG_RDI
-#  define IR_REG_INT_PNARG6  IR_REG_RSI
-#  define IR_REG_INT_PNARG7  IR_REG_RDX
-#  define IR_REG_INT_PNARG8  IR_REG_RCX
-#  define IR_REG_INT_PNARG9  IR_REG_R8
-#  define IR_REG_INT_PNARG10 IR_REG_R9
-#  define IR_REG_INT_PNARG11 IR_REG_R11
-#  define IR_REG_INT_PNARG12 IR_REG_RAX
-
-#  define IR_MAX_REG_ARGS 20 /* IR_REG_INT_PNARGS + IR_REG_FP_ARGS */
-
-#  define IR_REGSET_PNARGS \
+# define IR_REG_INT_PNARGS  12
+# define IR_REG_INT_PNARG1  IR_REG_R12
+# define IR_REG_INT_PNARG2  IR_REG_R13
+# define IR_REG_INT_PNARG3  IR_REG_R14
+# define IR_REG_INT_PNARG4  IR_REG_R15
+# define IR_REG_INT_PNARG5  IR_REG_RDI
+# define IR_REG_INT_PNARG6  IR_REG_RSI
+# define IR_REG_INT_PNARG7  IR_REG_RDX
+# define IR_REG_INT_PNARG8  IR_REG_RCX
+# define IR_REG_INT_PNARG9  IR_REG_R8
+# define IR_REG_INT_PNARG10 IR_REG_R9
+# define IR_REG_INT_PNARG11 IR_REG_R11
+# define IR_REG_INT_PNARG12 IR_REG_RAX
+
+/* https://github.com/llvm/llvm-project/blob/68bfe91b5a34f80dbcc4f0a7fa5d7aa1cdf959c2/llvm/lib/Target/X86/X86CallingConv.td#L1183 */
+# define IR_REGSET_PNPRESERVED IR_REGSET(IR_REG_RBP)
+
+# define IR_REGSET_PNSCRATCH \
+	(IR_REGSET_DIFFERENCE(IR_REGSET_INTERVAL(IR_REG_GP_FIRST, IR_REG_GP_LAST), IR_REGSET_PNPRESERVED) \
+	| IR_REGSET_FP)
+
+# define IR_REGSET_PNARGS \
 	(IR_REGSET_INTERVAL(IR_REG_R12, IR_REG_R15) | IR_REGSET(IR_REG_RDI) \
 	| IR_REGSET(IR_REG_RSI) | IR_REGSET(IR_REG_RDX) | IR_REGSET(IR_REG_RCX) \
 	| IR_REGSET(IR_REG_R8) | IR_REGSET(IR_REG_R9) | IR_REGSET(IR_REG_R11) \
 	| IR_REGSET(IR_REG_RAX) | IR_REGSET_INTERVAL(IR_REG_XMM0, IR_REG_XMM7))
 
-# else /* !preserve_none */
-#  define IR_MAX_REG_ARGS 14 /* IR_REG_INT_ARGS + IR_REG_FP_ARGS */
-# endif
-
 typedef struct _ir_va_list {
 	uint32_t  gp_offset;
 	uint32_t  fp_offset;