Fix PR70278, a problem with the previous split_reg change

	PR rtl-optimization/70278
	* lra-constraints.c (split_reg): Handle the case where biggest_mode is
	VOIDmode.

testsuite/
	* gcc.dg/torture/pr70278.c: New test.
	* gcc.target/arm/pr70278.c: New test.

From-SVN: r234342

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d988be26d676cca5df2e18224b36807501615b38..328fde839dd433f61a84ee051f8a18a4742062e6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-18  Bernd Schmidt  <bschmidt@redhat.com>
+
+       PR rtl-optimization/70278
+       * lra-constraints.c (split_reg): Handle the case where biggest_mode is
+       VOIDmode.
+
 2016-03-18  Jason Merrill  <jason@redhat.com>
 
        * calls.c (load_register_parameters): Fix zero size sibcall logic.

diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index ced9e12b0f1ad37148e8d198d2598d7ce1152861..4883eefc53239b200895509088af3881435bd6a0 100644 (file)
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -4982,7 +4982,12 @@ split_reg (bool before_p, int original_regno, rtx_insn *insn,
       nregs = 1;
       mode = lra_reg_info[hard_regno].biggest_mode;
       machine_mode reg_rtx_mode = GET_MODE (regno_reg_rtx[hard_regno]);
-      if (GET_MODE_SIZE (mode) > GET_MODE_SIZE (reg_rtx_mode))
+      /* A reg can have a biggest_mode of VOIDmode if it was only ever seen
+        as part of a multi-word register.  In that case, or if the biggest
+        mode was larger than a register, just use the reg_rtx.  Otherwise,
+        limit the size to that of the biggest access in the function.  */
+      if (mode == VOIDmode
+         || GET_MODE_SIZE (mode) > GET_MODE_SIZE (reg_rtx_mode))
        {
          original_reg = regno_reg_rtx[hard_regno];
          mode = reg_rtx_mode;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c3ceedbd88ed6ffcd78ab0dc9bd9eb7a91261c5c..53994fe63ec36402fb0401e818ab849f4777e39a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-18  Bernd Schmidt  <bschmidt@redhat.com>
+
+       PR rtl-optimization/70278
+       * gcc.dg/torture/pr70278.c: New test.
+       * gcc.target/arm/pr70278.c: New test.
+
 2016-03-18  David Malcolm  <dmalcolm@redhat.com>
 
        PR c/70281

diff --git a/gcc/testsuite/gcc.dg/torture/pr70278.c b/gcc/testsuite/gcc.dg/torture/pr70278.c
new file mode 100644 (file)
index 0000000..89bd266
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr70278.c
@@ -0,0 +1,37 @@
+/* { dg-do compile } */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice 
+ * is preserved.
+ * ====================================================
+ */
+typedef union
+{
+  double value;
+  struct
+  {
+    unsigned int msw;
+  } parts;
+} ieee_double_shape_type;
+double __ieee754_hypot(double x, double y)
+{
+ double a=x,b=y,t1,t2,y1,y2,w;
+ int j,k,ha,hb;
+ do { ieee_double_shape_type gh_u; gh_u.value = (x); (ha) = gh_u.parts.msw; } while (0);;
+ if(hb > ha) {a=y;b=x;j=ha; ha=hb;hb=j;} else {a=x;b=y;}
+ if(ha > 0x5f300000) {
+    do { ieee_double_shape_type sh_u; sh_u.value = (a); sh_u.parts.msw = (ha); (a) = sh_u.value; } while (0);;
+ }
+ w = a-b;
+ if (w <= b)
+ {
+     t2 = a - t1;
+     w = t1*y1-(w*(-w)-(t1*y2+t2*b));
+ }
+ if(k!=0) {
+ } else return w;
+}

diff --git a/gcc/testsuite/gcc.target/arm/pr70278.c b/gcc/testsuite/gcc.target/arm/pr70278.c
new file mode 100644 (file)
index 0000000..c44c07b
--- /dev/null
+++ b/gcc/testsuite/gcc.target/arm/pr70278.c
@@ -0,0 +1,41 @@
+/* { dg-do compile } */
+/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-march=*" } { "-march=armv4t" } } */
+/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-marm" } { "" } } */
+/* { dg-options "-mthumb" } */
+/* { dg-add-options arm_arch_v4t } */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice 
+ * is preserved.
+ * ====================================================
+ */
+typedef union
+{
+  double value;
+  struct
+  {
+    unsigned int msw;
+  } parts;
+} ieee_double_shape_type;
+double __ieee754_hypot(double x, double y)
+{
+ double a=x,b=y,t1,t2,y1,y2,w;
+ int j,k,ha,hb;
+ do { ieee_double_shape_type gh_u; gh_u.value = (x); (ha) = gh_u.parts.msw; } while (0);;
+ if(hb > ha) {a=y;b=x;j=ha; ha=hb;hb=j;} else {a=x;b=y;}
+ if(ha > 0x5f300000) {
+    do { ieee_double_shape_type sh_u; sh_u.value = (a); sh_u.parts.msw = (ha); (a) = sh_u.value; } while (0);;
+ }
+ w = a-b;
+ if (w <= b)
+ {
+     t2 = a - t1;
+     w = t1*y1-(w*(-w)-(t1*y2+t2*b));
+ }
+ if(k!=0) {
+ } else return w;
+}