re PR tree-optimization/22484 (ICE: verify_stmts failed with -O3)

2005-07-25  Andrew Pinski  <pinskia@physics.uc.edu>

        PR tree-opt/22484
        * tree-ssa-ccp.c (fold_stmt_inplace): Strip useless type conversions
        after fold.
        * tree-ssa-propagate.c (set_rhs): Reject invalid conditional operands.
2005-07-25  Andrew Pinski  <pinskia@physics.uc.edu>

        PR tree-opt/22484
        * testsuite/g++.dg/opt/loop2.C: New test.

From-SVN: r102369

gcc/ChangeLog

 2005-07-25  Andrew Pinski  <pinskia@physics.uc.edu>
 
+	PR tree-opt/22484
+	* tree-ssa-ccp.c (fold_stmt_inplace): Strip useless type conversions
+	after fold.
+	* tree-ssa-propagate.c (set_rhs): Reject invalid conditional operands.
+
+2005-07-25  Andrew Pinski  <pinskia@physics.uc.edu>
+
 	* tree-ssa-reassoc.c (reassociate_expr): Allow scaler floating point
 	types when flag_unsafe_math_optimizations is true.
 

gcc/testsuite/ChangeLog

 2005-07-25  Andrew Pinski  <pinskia@physics.uc.edu>
 
+	PR tree-opt/22484
+	* testsuite/g++.dg/opt/loop2.C: New test.
+
+2005-07-25  Andrew Pinski  <pinskia@physics.uc.edu>
+
 	* gcc.dg/tree-ssa/reassoc-3.c: New test.
 	* gcc.dg/tree-ssa/reassoc-4.c: New test.
 

gcc/tree-ssa-ccp.c

@@ -2335,6 +2335,7 @@ fold_stmt_inplace (tree stmt)
     return changed;
 
   new_rhs = fold (rhs);
+  STRIP_USELESS_TYPE_CONVERSION (new_rhs);
   if (new_rhs == rhs)
     return changed;
 

gcc/tree-ssa-propagate.c

@@ -604,6 +604,8 @@ set_rhs (tree *stmt_p, tree expr)
       break;
 
     case COND_EXPR:
+      if (!is_gimple_condexpr (expr))
+        return false;
       COND_EXPR_COND (stmt) = expr;
       break;
     case SWITCH_EXPR: