re PR middle-end/72747 (powerpc: wrong code generated for vec_splats in cascading...

gcc:
2016-10-26  Will Schmidt <will_schmidt@vnet.ibm.com>

        PR middle-end/72747
        * gimplify.c (gimplify_init_constructor): Move emit of constructor
        assignment to earlier in the if/else logic.

testsuite:
2016-10-26  Will Schmidt <will_schmidt@vnet.ibm.com>

        PR middle-end/72747
        * c-c++-common/pr72747-1.c: New test.
        * c-c++-common/pr72747-2.c: Likewise.

From-SVN: r241647

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 223396ce4985c000cc62214af5b4c7517d8b0195..f932103b4c1ccf802797786ef6ffaeb0cb0bf539 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-10-28  Will Schmidt <will_schmidt@vnet.ibm.com>
+
+       PR middle-end/72747
+       * gimplify.c (gimplify_init_constructor): Move emit of constructor
+       assignment to earlier in the if/else logic.
+
 2016-10-28  Richard Biener  <rguenther@suse.de>
 
        PR middle-end/78128

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 5da1725acd14f79d83e5235accd161be300e7ab0..1531582be115c92c17a9dfacf9d16b526eab469d 100644 (file)
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -4730,24 +4730,23 @@ gimplify_init_constructor (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p,
 
   if (ret == GS_ERROR)
     return GS_ERROR;
-  else if (want_value)
+  /* If we have gimplified both sides of the initializer but have
+     not emitted an assignment, do so now.  */
+  if (*expr_p)
+    {
+      tree lhs = TREE_OPERAND (*expr_p, 0);
+      tree rhs = TREE_OPERAND (*expr_p, 1);
+      gassign *init = gimple_build_assign (lhs, rhs);
+      gimplify_seq_add_stmt (pre_p, init);
+    }
+  if (want_value)
     {
       *expr_p = object;
       return GS_OK;
     }
   else
     {
-      /* If we have gimplified both sides of the initializer but have
-        not emitted an assignment, do so now.  */
-      if (*expr_p)
-       {
-         tree lhs = TREE_OPERAND (*expr_p, 0);
-         tree rhs = TREE_OPERAND (*expr_p, 1);
-         gassign *init = gimple_build_assign (lhs, rhs);
-         gimplify_seq_add_stmt (pre_p, init);
-         *expr_p = NULL;
-       }
-
+      *expr_p = NULL;
       return GS_ALL_DONE;
     }
 }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a51fcf4d7b504c549ab928ba1494911d511690c4..b4d7ec055c822566d7bc592b1fc8e87f4aaeacb9 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2016-10-26  Will Schmidt <will_schmidt@vnet.ibm.com>
+
+       PR middle-end/72747
+       * c-c++-common/pr72747-1.c: New test.
+       * c-c++-common/pr72747-2.c: Likewise.
+
 2016-10-28  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
 
        * gcc.target/s390/oscbreak-1.c: New test.

diff --git a/gcc/testsuite/c-c++-common/pr72747-1.c b/gcc/testsuite/c-c++-common/pr72747-1.c
new file mode 100644 (file)
index 0000000..e87069d
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/pr72747-1.c
@@ -0,0 +1,16 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target powerpc_altivec_ok } */
+/* { dg-options "-maltivec -fdump-tree-gimple" } */
+
+/* PR 72747: Test that cascaded definition is happening for constant vectors. */
+
+#include <altivec.h>
+
+int main (int argc, char *argv[])
+{
+       __vector int v1,v2;
+       v1 = v2 = vec_splats ((int) 42);
+       return 0;
+}
+/* { dg-final { scan-tree-dump-times " v2 = { 42, 42, 42, 42 }" 1 "gimple" } } */
+

diff --git a/gcc/testsuite/c-c++-common/pr72747-2.c b/gcc/testsuite/c-c++-common/pr72747-2.c
new file mode 100644 (file)
index 0000000..080d6fc
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/pr72747-2.c
@@ -0,0 +1,18 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target powerpc_altivec_ok } */
+/* { dg-options "-c -maltivec -fdump-tree-gimple" } */
+
+/* PR 72747: test that cascaded definition is happening for non constants. */
+
+void foo ()
+{
+  extern int i;
+  __vector int v,w;
+    v = w = (vector int) { i };
+}
+
+int main (int argc, char *argv[])
+{
+  return 0;
+}
+/* { dg-final { scan-tree-dump-times " w = {i.0_1}" 1 "gimple" } } */