From: Paolo Bonzini <bonzini@gnu.org>
Date: Thu, 20 Oct 2005 17:23:54 +0000 (+0000)
Subject: dojump.c (do_jump): Revert the last patch as it breaks Ada.
X-Git-Tag: releases/gcc-3.4.5~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7506e13db0db5089c092b184ca3a21b6ee8d804;p=thirdparty%2Fgcc.git

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 a21864273bd1..d74b16a343b2 100644
--- 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 be3df060027d..b232576d440e 100644
--- 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 ();