re PR tree-optimization/37662 (ice: tree check: expected ssa_name, have integer_cst...

2008-09-30  Paolo Bonzini  <bonzini@gnu.org>

	PR tree-optimization/37662
	* tree-ssa-ccp.c (fold_gimple_assign): Invert the operands of a
	commutative binary operation if they are in the wrong order and
	fold_build2 produces non-GIMPLE.

From-SVN: r140809

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ba26097f14b46bc8848c1c8ae1744e693f407fe7..b6f16013f8493bb765f4a51ad741225b356ad969 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-30  Paolo Bonzini  <bonzini@gnu.org>
+
+       PR tree-optimization/37662
+       * tree-ssa-ccp.c (fold_gimple_assign): Invert the operands of a
+       commutative binary operation if they are in the wrong order and
+       fold_build2 produces non-GIMPLE.
+
 2008-09-30  Jakub Jelinek  <jakub@redhat.com>
 
        PR tree-optimization/37662

diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index 22626a53840b3e87c7c2e384d9aaa5ab1c397e6c..383367e9fb1c1bd761c79002b2c7aab6f2083263 100644 (file)
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -2711,6 +2711,17 @@ fold_gimple_assign (gimple_stmt_iterator *si)
           STRIP_USELESS_TYPE_CONVERSION (result);
           if (valid_gimple_rhs_p (result))
            return result;
+
+         /* Fold might have produced non-GIMPLE, so if we trust it blindly
+            we lose canonicalization opportunities.  Do not go again
+            through fold here though, or the same non-GIMPLE will be
+            produced.  */
+          if (commutative_tree_code (subcode)
+              && tree_swap_operands_p (gimple_assign_rhs1 (stmt),
+                                       gimple_assign_rhs2 (stmt), false))
+            return build2 (subcode, TREE_TYPE (gimple_assign_lhs (stmt)),
+                           gimple_assign_rhs2 (stmt),
+                           gimple_assign_rhs1 (stmt));
         }
       break;