From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 28 Aug 2018 10:15:54 +0000 (+0000)
Subject: 2018-08-28  Richard Biener  <rguenther@suse.de>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21461a79c10f812f0902c98291c0f755beb8a748;p=thirdparty%2Fgcc.git

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

	PR tree-optimization/87117
	* tree-ssa-sccvn.c (eliminate_dom_walker::eliminate_cleanup):
	Handle removed stmt without LHS (GIMPLE_NOP).


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@263912 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 694fdf24db3f..a357b4ba448d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-28  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/87117
+	* tree-ssa-sccvn.c (eliminate_dom_walker::eliminate_cleanup):
+	Handle removed stmt without LHS (GIMPLE_NOP).
+
 2018-08-28  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/87117
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 381fc8dc1958..9277de0cbdc5 100644
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -5425,31 +5425,28 @@ eliminate_dom_walker::eliminate_cleanup (bool region_p)
 		  do_release_defs = false;
 		}
 	    }
-	  else
-	    {
-	      tree lhs = gimple_get_lhs (stmt);
-	      if (TREE_CODE (lhs) == SSA_NAME
-		  && !has_zero_uses (lhs))
-		{
-		  if (dump_file && (dump_flags & TDF_DETAILS))
-		    fprintf (dump_file, "Keeping eliminated stmt live "
-			     "as copy because of out-of-region uses\n");
-		  tree sprime = eliminate_avail (gimple_bb (stmt), lhs);
-		  gimple_stmt_iterator gsi = gsi_for_stmt (stmt);
-		  if (is_gimple_assign (stmt))
-		    {
-		      gimple_assign_set_rhs_from_tree (&gsi, sprime);
-		      update_stmt (gsi_stmt (gsi));
-		      continue;
-		    }
-		  else
-		    {
-		      gimple *copy = gimple_build_assign (lhs, sprime);
-		      gsi_insert_before (&gsi, copy, GSI_SAME_STMT);
-		      do_release_defs = false;
-		    }
-		}
-	    }
+	  else if (tree lhs = gimple_get_lhs (stmt))
+	    if (TREE_CODE (lhs) == SSA_NAME
+		&& !has_zero_uses (lhs))
+	      {
+		if (dump_file && (dump_flags & TDF_DETAILS))
+		  fprintf (dump_file, "Keeping eliminated stmt live "
+			   "as copy because of out-of-region uses\n");
+		tree sprime = eliminate_avail (gimple_bb (stmt), lhs);
+		gimple_stmt_iterator gsi = gsi_for_stmt (stmt);
+		if (is_gimple_assign (stmt))
+		  {
+		    gimple_assign_set_rhs_from_tree (&gsi, sprime);
+		    update_stmt (gsi_stmt (gsi));
+		    continue;
+		  }
+		else
+		  {
+		    gimple *copy = gimple_build_assign (lhs, sprime);
+		    gsi_insert_before (&gsi, copy, GSI_SAME_STMT);
+		    do_release_defs = false;
+		  }
+	      }
 	}
 
       if (dump_file && (dump_flags & TDF_DETAILS))