re PR middle-end/17967 (Expand is considered slower? (remove_useless_stmts is conside...

2004-10-14  Andrew Pinski  <pinskia@physics.uc.edu>

        PR middle-end/17967
        Revert:
                * tree-cfg.c (remove_usless_stmts_cond):  Fold statement.
                (remove_useless_stmts_1):  Fold trees we know how to fold.

From-SVN: r89057

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0a10096f447ebe5d71afda9b6089978d22dff291..d36603a72289b45b7e64b22d567dc25edcec76f5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-14  Andrew Pinski  <pinskia@physics.uc.edu>
+
+       PR middle-end/17967
+       Revert:
+               * tree-cfg.c (remove_usless_stmts_cond):  Fold statement.
+               (remove_useless_stmts_1):  Fold trees we know how to fold.
+
 2004-10-14  Joseph S. Myers  <joseph@codesourcery.com>
 
        * config/rs6000/eabispe.h (SUBSUBTARGET_OVERRIDE_OPTIONS),

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 293b24e1957c7bbb3ff9c7bfb32434a2d006eb70..2986e315d4b801d3effa39099c5f884be745d1f6 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -1204,7 +1204,6 @@ remove_useless_stmts_cond (tree *stmt_p, struct rus_data *data)
   else_has_label = data->has_label;
   data->has_label = save_has_label | then_has_label | else_has_label;
 
-  fold_stmt (stmt_p);
   then_clause = COND_EXPR_THEN (*stmt_p);
   else_clause = COND_EXPR_ELSE (*stmt_p);
   cond = COND_EXPR_COND (*stmt_p);
@@ -1552,13 +1551,11 @@ remove_useless_stmts_1 (tree *tp, struct rus_data *data)
       break;
 
     case RETURN_EXPR:
-      fold_stmt (tp);
       data->last_goto = NULL;
       data->may_branch = true;
       break;
 
     case CALL_EXPR:
-      fold_stmt (tp);
       data->last_goto = NULL;
       notice_special_calls (t);
       update_call_expr_flags (t);
@@ -1568,7 +1565,6 @@ remove_useless_stmts_1 (tree *tp, struct rus_data *data)
 
     case MODIFY_EXPR:
       data->last_goto = NULL;
-      fold_stmt (tp);
       op = get_call_expr_in (t);
       if (op)
        {
@@ -1604,10 +1600,6 @@ remove_useless_stmts_1 (tree *tp, struct rus_data *data)
          }
       }
       break;
-    case SWITCH_EXPR:
-      fold_stmt (tp);
-      data->last_goto = NULL;
-      break;
 
     default:
       data->last_goto = NULL;