re PR tree-optimization/87117 (ICE in eliminate_dom_walker::eliminate_cleanup(bool...

2018-08-29  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/87117
	* tree-ssa-sccvn.c (eliminate_dom_walker::eliminate_stmt): Only
	re-value-number released SSA VDEFs.

	* gfortran.dg/pr87117.f90: New testcase.

From-SVN: r263945

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 03a98c9..2c0f502 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2018-08-29  Richard Biener  <rguenther@suse.de>
 
+       PR tree-optimization/87117
+       * tree-ssa-sccvn.c (eliminate_dom_walker::eliminate_stmt): Only
+       re-value-number released SSA VDEFs.
+
+2018-08-29  Richard Biener  <rguenther@suse.de>
+
        PR tree-optimization/87126
        * tree-ssa-sccvn.c (vn_reference_insert): Remove assert.
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e6a9c86..765d4a1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2018-08-29  Richard Biener  <rguenther@suse.de>
 
+       PR tree-optimization/87117
+       * gfortran.dg/pr87117.f90: New testcase.
+
+2018-08-29  Richard Biener  <rguenther@suse.de>
+
        PR tree-optimization/87126
        * gcc.dg/tree-ssa/pr87126.c: New testcase.
 

diff --git a/gcc/testsuite/gfortran.dg/pr87117.f90 b/gcc/testsuite/gfortran.dg/pr87117.f90
new file mode 100644 (file)
index 0000000..afca653
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr87117.f90
@@ -0,0 +1,14 @@
+! { dg-do compile }
+! { dg-options "-O" }
+program p
+   real(4) :: a, b
+   integer(4) :: n, m
+   equivalence (a, n)
+   a = 1024.0
+   m = 8
+   a = 1024.0
+   b = set_exponent(a, m)
+   n = 8
+   a = f(a, n)
+   b = set_exponent(a, m)
+end

diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index aaac430..04b3808 100644 (file)
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -4989,8 +4989,14 @@ eliminate_dom_walker::eliminate_stmt (basic_block b, gimple_stmt_iterator *gsi)
          propagate_tree_value_into_stmt (gsi, sprime);
          stmt = gsi_stmt (*gsi);
          update_stmt (stmt);
+         /* In case the VDEF on the original stmt was released, value-number
+            it to the VUSE.  This is to make vuse_ssa_val able to skip
+            released virtual operands.  */
          if (vdef != gimple_vdef (stmt))
-           VN_INFO (vdef)->valnum = vuse;
+           {
+             gcc_assert (SSA_NAME_IN_FREE_LIST (vdef));
+             VN_INFO (vdef)->valnum = vuse;
+           }
 
          /* If we removed EH side-effects from the statement, clean
             its EH information.  */
@@ -5268,7 +5274,10 @@ eliminate_dom_walker::eliminate_stmt (basic_block b, gimple_stmt_iterator *gsi)
            fprintf (dump_file, "  Removed AB side-effects.\n");
        }
       update_stmt (stmt);
-      if (vdef != gimple_vdef (stmt))
+      /* In case the VDEF on the original stmt was released, value-number
+         it to the VUSE.  This is to make vuse_ssa_val able to skip
+        released virtual operands.  */
+      if (vdef && SSA_NAME_IN_FREE_LIST (vdef))
        VN_INFO (vdef)->valnum = vuse;
     }