diff mbox series

[committed,AArch64] Improve poly_int handling in aarch64_layout_frame

Message ID mpt5zkpufnh.fsf@arm.com
State New
Headers show
Series [committed,AArch64] Improve poly_int handling in aarch64_layout_frame | expand

Commit Message

Richard Sandiford Oct. 16, 2019, 10:51 a.m. UTC 
I'd used known_lt when converting these conditions to poly_int,
but on reflection that was a bad choice.  The code isn't just
doing a range check; it specifically needs constants that will
fit in a certain encoding.

Tested on aarch64-linux-gnu and aarch64_be-elf, applied as r277061.

Richard


2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* config/aarch64/aarch64.c (aarch64_layout_frame): Use is_constant
	rather than known_lt when choosing frame layouts.
diff mbox series

Patch

Index: gcc/config/aarch64/aarch64.c
===================================================================
--- gcc/config/aarch64/aarch64.c	2019-10-16 11:47:34.727496649 +0100
+++ gcc/config/aarch64/aarch64.c	2019-10-16 11:50:14.386356922 +0100
@@ -5447,7 +5447,7 @@  #define SLOT_REQUIRED     (-1)
   else if (frame.wb_candidate1 != INVALID_REGNUM)
     max_push_offset = 256;
 
-  HOST_WIDE_INT const_size, const_fp_offset;
+  HOST_WIDE_INT const_size, const_outgoing_args_size, const_fp_offset;
   if (frame.frame_size.is_constant (&const_size)
       && const_size < max_push_offset
       && known_eq (crtl->outgoing_args_size, 0))
@@ -5457,16 +5457,18 @@  #define SLOT_REQUIRED     (-1)
 	 stp reg3, reg4, [sp, 16]  */
       frame.callee_adjust = const_size;
     }
-  else if (known_lt (crtl->outgoing_args_size + frame.saved_regs_size, 512)
+  else if (crtl->outgoing_args_size.is_constant (&const_outgoing_args_size)
+	   && const_outgoing_args_size + frame.saved_regs_size < 512
 	   && !(cfun->calls_alloca
-		&& known_lt (frame.hard_fp_offset, max_push_offset)))
+		&& frame.hard_fp_offset.is_constant (&const_fp_offset)
+		&& const_fp_offset < max_push_offset))
     {
       /* Frame with small outgoing arguments:
 	 sub sp, sp, frame_size
 	 stp reg1, reg2, [sp, outgoing_args_size]
 	 stp reg3, reg4, [sp, outgoing_args_size + 16]  */
       frame.initial_adjust = frame.frame_size;
-      frame.callee_offset = frame.frame_size - frame.hard_fp_offset;
+      frame.callee_offset = const_outgoing_args_size;
     }
   else if (frame.hard_fp_offset.is_constant (&const_fp_offset)
 	   && const_fp_offset < max_push_offset)