From afb0c9cda9b060d70397c69a6b8d6bd0a00139f0 Mon Sep 17 00:00:00 2001 From: Bin Cheng Date: Wed, 19 Sep 2012 01:49:09 +0000 Subject: [PATCH] * fold-const.c (fold_truth_andor) Remove duplicated check on BRANCH_COST. From-SVN: r191457 --- gcc/ChangeLog | 5 +++++ gcc/fold-const.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ed8d8b1575b..044a49b0b10 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2012-09-19 Bin Cheng + + * fold-const.c (fold_truth_andor) Remove duplicated check on + BRANCH_COST. + 2012-09-18 Eric Botcazou PR middle-end/54617 diff --git a/gcc/fold-const.c b/gcc/fold-const.c index c76e7ff68d3..5f2c7971eb2 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -8435,9 +8435,7 @@ fold_truth_andor (location_t loc, enum tree_code code, tree type, if ((tem = fold_truth_andor_1 (loc, code, type, arg0, arg1)) != 0) return tem; - if ((BRANCH_COST (optimize_function_for_speed_p (cfun), - false) >= 2) - && LOGICAL_OP_NON_SHORT_CIRCUIT + if (LOGICAL_OP_NON_SHORT_CIRCUIT && (code == TRUTH_AND_EXPR || code == TRUTH_ANDIF_EXPR || code == TRUTH_OR_EXPR