re PR tree-optimization/64728 (internal compiler error: SSA corruption)

2015-01-22  Richard Biener  <rguenther@suse.de>

	PR middle-end/64728
	* tree-ssa-coalesce.c (coalesce_partitions): Do not perform
	abnormal coalescing on undefined SSA names.

	* gcc.dg/torture/pr64728.c: New testcase.

From-SVN: r220003

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 82883c1b4ac0a5301aaad144925b78a9d1eb70bf..e9887c48ba3accf4ddc1e4145faad73f42ffe0bf 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-22  Richard Biener  <rguenther@suse.de>
+
+       PR middle-end/64728
+       * tree-ssa-coalesce.c (coalesce_partitions): Do not perform
+       abnormal coalescing on undefined SSA names.
+
 2015-22-01  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/64688

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8e6dadc2d4371dceb137d535f31e18a7c6a26d1e..8bebdac3cf8a0677645044dda258d0256c2e2cd1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-22  Richard Biener  <rguenther@suse.de>
+
+       PR middle-end/64728
+       * gcc.dg/torture/pr64728.c: New testcase.
+
 2015-22-01  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/64688

diff --git a/gcc/testsuite/gcc.dg/torture/pr64728.c b/gcc/testsuite/gcc.dg/torture/pr64728.c
new file mode 100644 (file)
index 0000000..65c8508
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr64728.c
@@ -0,0 +1,27 @@
+/* { dg-do compile } */
+
+#include <setjmp.h>
+
+jmp_buf a;
+int b, d;
+void baz (long);
+
+static void
+bar (long *x)
+{
+  if (d)
+    *x = b;
+}
+
+void
+foo ()
+{
+  baz (0);
+  if (setjmp (a))
+    {
+      long c;
+      bar (&c);
+      baz (c);
+    }
+  baz (0);
+}

diff --git a/gcc/tree-ssa-coalesce.c b/gcc/tree-ssa-coalesce.c
index fda79dce784c501b30b9b7f5f192501d9ef3756f..be696fe8147f265295ff2ce5835282ffc8065143 100644 (file)
--- a/gcc/tree-ssa-coalesce.c
+++ b/gcc/tree-ssa-coalesce.c
@@ -1213,8 +1213,13 @@ coalesce_partitions (var_map map, ssa_conflicts_p graph, coalesce_list_p cl,
                 gsi_next (&gsi))
              {
                gphi *phi = gsi.phi ();
+               tree arg = PHI_ARG_DEF (phi, e->dest_idx);
+               if (SSA_NAME_IS_DEFAULT_DEF (arg)
+                   && (!SSA_NAME_VAR (arg)
+                       || TREE_CODE (SSA_NAME_VAR (arg)) != PARM_DECL))
+                 continue;
+
                tree res = PHI_RESULT (phi);
-               tree arg = PHI_ARG_DEF (phi, e->dest_idx);
                int v1 = SSA_NAME_VERSION (res);
                int v2 = SSA_NAME_VERSION (arg);