From 84b251e4fd6537c189334eefda043e71832a5a01 Mon Sep 17 00:00:00 2001 From: dje Date: Mon, 7 Mar 2005 21:24:21 +0000 Subject: [PATCH] * fold-const.c (fold_binary_op_with_conditional_arg): Fix typo ordering ops from earlier change. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96046 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/fold-const.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dc3a09efc84..ccb32deb926 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2005-03-07 David Edelsohn + + * fold-const.c (fold_binary_op_with_conditional_arg): Fix typo + ordering ops from earlier change. + 2005-03-07 Per Bothner Various fixes to allow us to again build if --enable-mapped-location: diff --git a/gcc/fold-const.c b/gcc/fold-const.c index e9fd5521d49..be21160303f 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -5459,7 +5459,7 @@ fold_binary_op_with_conditional_arg (enum tree_code code, tree cond, tree arg, int cond_first_p) { tree cond_type = cond_first_p ? TREE_TYPE (op0) : TREE_TYPE (op1); - tree arg_type = cond_first_p ? TREE_TYPE (op0) : TREE_TYPE (op1); + tree arg_type = cond_first_p ? TREE_TYPE (op1) : TREE_TYPE (op0); tree test, true_value, false_value; tree lhs = NULL_TREE; tree rhs = NULL_TREE; -- 2.11.4.GIT