backport: re PR tree-optimization/70152 (gcc ICE at -O3 and above on valid code on...

	Backported from mainline
	2016-03-09  Jakub Jelinek  <jakub@redhat.com>

	PR tree-optimization/70152
	* tree-sra.c (replace_removed_params_ssa_names): Copy over
	SSA_NAME_OCCURS_IN_ABNORMAL_PHI from old_name to new_name.

	* gcc.dg/pr70152.c: New test.

From-SVN: r238138

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 77a3af91ddd2867c8cd0f4169f89b8617c241a2e..f05665ea44c8563865fca88d3705474ca20c16f6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,12 @@
 2016-07-07  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2016-03-09  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/70152
+       * tree-sra.c (replace_removed_params_ssa_names): Copy over
+       SSA_NAME_OCCURS_IN_ABNORMAL_PHI from old_name to new_name.
+
        2016-02-26  Jakub Jelinek  <jakub@redhat.com>
                    Eric Botcazou  <ebotcazou@adacore.com>
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 96a3b621674dfe57f5cba254bbf3d3865fe4070d..aec652448f325adff6aa165a9ca1974ce4677399 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2016-07-07  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2016-03-09  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/70152
+       * gcc.dg/pr70152.c: New test.
+
        2016-02-26  Jakub Jelinek  <jakub@redhat.com>
                    Eric Botcazou  <ebotcazou@adacore.com>
 

diff --git a/gcc/testsuite/gcc.dg/pr70152.c b/gcc/testsuite/gcc.dg/pr70152.c
new file mode 100644 (file)
index 0000000..27a092d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr70152.c
@@ -0,0 +1,27 @@
+/* PR tree-optimization/70152 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int a;
+int foo (void);
+int setjmp (char *);
+char buf[64];
+
+static int
+bar (int x)
+{
+  x = 0;
+  setjmp (buf);
+  for (;;)
+    {
+    switch (x)
+      case 5:
+       x = foo ();
+    }
+}
+
+void
+baz (void)
+{
+  bar (a);
+}

diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index 03209f4f2d03ce5db4e653a1542f89b9e686353e..3659ff38a0e2f815e65835dc313925e5d221038a 100644 (file)
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -4491,6 +4491,8 @@ replace_removed_params_ssa_names (tree old_name, gimple stmt,
 
   repl = get_replaced_param_substitute (adj);
   new_name = make_ssa_name (repl, stmt);
+  SSA_NAME_OCCURS_IN_ABNORMAL_PHI (new_name)
+    = SSA_NAME_OCCURS_IN_ABNORMAL_PHI (old_name);
 
   if (dump_file)
     {