gimple-fold.c (fold_stmt_1): Remove code handling folding stmts away.

2012-12-06  Richard Biener  <rguenther@suse.de>

	* gimple-fold.c (fold_stmt_1): Remove code handling folding
	stmts away.

From-SVN: r194247

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9d87b558656deafc6f614ad9a00f86ff00f941fe..6b63bc237380ecf53d232e39ad161c5c3ac7a38b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-06  Richard Biener  <rguenther@suse.de>
+
+       * gimple-fold.c (fold_stmt_1): Remove code handling folding
+       stmts away.
+
 2012-12-06  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        * doc/sourcebuild.texi: Document arm_v8_neon_ok.

diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index 6c4a46fb10b674cef9f4aeeb6ed9b24c661cbdcd..ef05fd9d9bf6578ae1b357687e17069268ef497c 100644 (file)
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -1157,11 +1157,6 @@ fold_stmt_1 (gimple_stmt_iterator *gsi, bool inplace)
   bool changed = false;
   gimple stmt = gsi_stmt (*gsi);
   unsigned i;
-  gimple_stmt_iterator gsinext = *gsi;
-  gimple next_stmt;
-
-  gsi_next (&gsinext);
-  next_stmt = gsi_end_p (gsinext) ? NULL : gsi_stmt (gsinext);
 
   /* Fold the main computation performed by the statement.  */
   switch (gimple_code (stmt))
@@ -1284,9 +1279,8 @@ fold_stmt_1 (gimple_stmt_iterator *gsi, bool inplace)
 
   stmt = gsi_stmt (*gsi);
 
-  /* Fold *& on the lhs.  Don't do this if stmt folded into nothing,
-     as we'd changing the next stmt.  */
-  if (gimple_has_lhs (stmt) && stmt != next_stmt)
+  /* Fold *& on the lhs.  */
+  if (gimple_has_lhs (stmt))
     {
       tree lhs = gimple_get_lhs (stmt);
       if (lhs && REFERENCE_CLASS_P (lhs))