re PR tree-optimization/66123 (Array of labels as values + ternary operator + pointer...

2015-05-13  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/66123
	* tree-ssa-dom.c (propagate_rhs_into_lhs): Check if we found
	a taken edge.

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

From-SVN: r223130

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aa9c72e..d9a4fe4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2015-05-13  Richard Biener  <rguenther@suse.de>
 
+       PR tree-optimization/66123
+       * tree-ssa-dom.c (propagate_rhs_into_lhs): Check if we found
+       a taken edge.
+
+2015-05-13  Richard Biener  <rguenther@suse.de>
+
        PR middle-end/66110
        * alias.c (alias_sets_conflict_p): Do not treat has_zero_child
        specially.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index be35550..8dcf8cb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2015-05-13  Richard Biener  <rguenther@suse.de>
 
+       PR tree-optimization/66123
+       * gcc.dg/torture/pr66123.c: New testcase.
+
+2015-05-13  Richard Biener  <rguenther@suse.de>
+
        PR middle-end/66110
        * gcc.dg/alias-2.c: Adjust.
        * gcc.dg/tree-ssa/ssa-dse-17.c: New testcase.

diff --git a/gcc/testsuite/gcc.dg/torture/pr66123.c b/gcc/testsuite/gcc.dg/torture/pr66123.c
new file mode 100644 (file)
index 0000000..848f8fe
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr66123.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+
+int
+test (int foo)
+{
+  static void *dummy[] = { &&a, &&b };
+  goto *((char *) &&b - 2 * (foo < 0));
+a:
+b:
+  return 0;
+}

diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index 14f3e9e..42324ee 100644 (file)
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -2918,6 +2918,9 @@ propagate_rhs_into_lhs (gimple stmt, tree lhs, tree rhs, bitmap interesting_name
                {
                  basic_block bb = gimple_bb (use_stmt);
                  edge te = find_taken_edge (bb, val);
+                 if (!te)
+                   continue;
+
                  edge_iterator ei;
                  edge e;
                  gimple_stmt_iterator gsi;