re PR target/57845 (ICE with -freg-struct-return on SPARC)

	PR target/57845
	* config/sparc/sparc.c (sparc_function_value_1): In 32-bit mode, do
	not promote the mode for aggregate types.

From-SVN: r230074

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bf785384ec862b5466ba1b01f1b8db8633318bea..32c31559f7addc225354e3209effa8fd1b20b71d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,9 +1,15 @@
+2015-11-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+       PR target/57845
+       * config/sparc/sparc.c (sparc_function_value_1): In 32-bit mode, do
+       not promote the mode for aggregate types.
+
 2015-11-09  Nathan Sidwell  <nathan@codesourcery.com>
 
        * omp-low.h (replace_oacc_fn_attrib, build_oacc_routine_dims): Declare.
        * omp-low.c (build_oacc_routine_dims): New.
 
-2015-11-08  Michael Meissner  <meissner@linux.vnet.ibm.com>
+2015-11-09  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
        * config/rs6000/constraints.md (wF constraint): New constraints
        for power9/toc fusion.

diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 7fa702e7d865ab20cb821ce1a6618e50ea776fc9..23f112583c279ff19b7b2f12c7722546f2a2dfc1 100644 (file)
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -7329,9 +7329,10 @@ sparc_function_value_1 (const_tree type, machine_mode mode,
        mode = word_mode;
     }
 
-  /* We should only have pointer and integer types at this point.  This must
-     match sparc_promote_function_mode.  */
+  /* We should only have pointer and integer types at this point, except with
+     -freg-struct-return.  This must match sparc_promote_function_mode.  */
   else if (TARGET_ARCH32
+          && !(type && AGGREGATE_TYPE_P (type))
           && mclass == MODE_INT
           && GET_MODE_SIZE (mode) < UNITS_PER_WORD)
     mode = word_mode;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2875f15734fe5813721d096148df68d8d28f347f..88e1f522d8a6d4af80de08521ad698f981ee0297 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,4 +1,10 @@
-2015-11-08  Michael Meissner  <meissner@linux.vnet.ibm.com>
+2015-11-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc.target/sparc/sparc-ret.c: Rename to...
+       * gcc.target/sparc/sparc-ret-1.c: ...this.
+       * gcc.target/sparc/sparc-ret-2.c: New test.
+
+2015-11-09  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
        * lib/target-supports.exp (check_p8vector_hw_available): Split
        long line.

diff --git a/gcc/testsuite/gcc.target/sparc/sparc-ret-1.c b/gcc/testsuite/gcc.target/sparc/sparc-ret-1.c
new file mode 100644 (file)
index 0000000..808e8a9
--- /dev/null
+++ b/gcc/testsuite/gcc.target/sparc/sparc-ret-1.c
@@ -0,0 +1,26 @@
+/* { dg-do compile } */
+/* { dg-skip-if "no register windows" { *-*-* } { "-mflat" } { "" } } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-options "-mcpu=ultrasparc -O" } */
+
+/* Make sure that Ultrasparc return insn do not read below the stack.  */
+
+void toto (int *);
+
+int bar (int a, int b, int c, int d, int e, int f, int g, int h)
+{
+  int res;
+
+  toto (&res);
+  return h;
+}
+/* { dg-final { scan-assembler "return\[ \t\]*%i7\\+8\n\[^\n\]*ld\[ \t\]*\\\[%sp\\+96\\\]" } } */
+
+int bar2 ()
+{
+  int res;
+
+  toto (&res);
+  return res;
+}
+/* { dg-final { scan-assembler "return\[ \t\]*%i7\\+8\n\[^\n\]*nop" } } */

diff --git a/gcc/testsuite/gcc.target/sparc/sparc-ret-2.c b/gcc/testsuite/gcc.target/sparc/sparc-ret-2.c
new file mode 100644 (file)
index 0000000..536b9b7
--- /dev/null
+++ b/gcc/testsuite/gcc.target/sparc/sparc-ret-2.c
@@ -0,0 +1,13 @@
+/* PR target/57845 */
+
+/* { dg-do compile } */
+/* { dg-options "-freg-struct-return" } */
+
+struct S { short int i; };
+
+struct S foo (short int i)
+{
+  struct S s;
+  s.i = i;
+  return s;
+}

diff --git a/gcc/testsuite/gcc.target/sparc/sparc-ret.c b/gcc/testsuite/gcc.target/sparc/sparc-ret.c
deleted file mode 100644 (file)
index 808e8a9..0000000
--- a/gcc/testsuite/gcc.target/sparc/sparc-ret.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* { dg-do compile } */
-/* { dg-skip-if "no register windows" { *-*-* } { "-mflat" } { "" } } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-options "-mcpu=ultrasparc -O" } */
-
-/* Make sure that Ultrasparc return insn do not read below the stack.  */
-
-void toto (int *);
-
-int bar (int a, int b, int c, int d, int e, int f, int g, int h)
-{
-  int res;
-
-  toto (&res);
-  return h;
-}
-/* { dg-final { scan-assembler "return\[ \t\]*%i7\\+8\n\[^\n\]*ld\[ \t\]*\\\[%sp\\+96\\\]" } } */
-
-int bar2 ()
-{
-  int res;
-
-  toto (&res);
-  return res;
-}
-/* { dg-final { scan-assembler "return\[ \t\]*%i7\\+8\n\[^\n\]*nop" } } */