dojump.c (do_jump): Revert the last patch as it breaks Ada.

2005-10-19  Paolo Bonzini  <bonzini@gnu.org>

	* dojump.c (do_jump): Revert the last patch as it breaks Ada.

From-SVN: r105681

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a21864273bd1112d612c125330014bee4df67648..d74b16a343b24a2a896df5b96090ccbece774226 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-19  Paolo Bonzini  <bonzini@gnu.org>
+
+       * dojump.c (do_jump): Revert the last patch as it breaks Ada.
+
 2005-10-19  Paolo Bonzini  <bonzini@gnu.org>
 
        PR #19672

diff --git a/gcc/dojump.c b/gcc/dojump.c
index be3df060027d224772c052b8bcb9a08ccc0d9ed3..b232576d440ef58c04b51ac1e5f851a576c74c9b 100644 (file)
--- a/gcc/dojump.c
+++ b/gcc/dojump.c
@@ -332,12 +332,6 @@ do_jump (tree exp, rtx if_false_label, rtx if_true_label)
       do_jump (TREE_OPERAND (exp, 0), if_true_label, if_false_label);
       break;
 
-    case TRUTH_AND_EXPR:
-      if (BRANCH_COST >= 4)
-        goto normal;
-
-      /* Else fall through to TRUTH_ANDIF_EXPR.  */
-
     case TRUTH_ANDIF_EXPR:
       if (if_false_label == 0)
         if_false_label = drop_through_label = gen_label_rtx ();
@@ -347,12 +341,6 @@ do_jump (tree exp, rtx if_false_label, rtx if_true_label)
       end_cleanup_deferral ();
       break;
 
-    case TRUTH_OR_EXPR:
-      if (BRANCH_COST >= 4)
-        goto normal;
-
-      /* Else fall through to TRUTH_ORIF_EXPR.  */
-
     case TRUTH_ORIF_EXPR:
       if (if_true_label == 0)
         if_true_label = drop_through_label = gen_label_rtx ();