From: Eric Botcazou <ebotcazou@libertysurf.fr>
Date: Tue, 29 Oct 2002 14:17:33 +0000 (+0100)
Subject: expr.c (expand_expr): Don't use simplify_binary_operation; check for zero operands... 
X-Git-Tag: releases/gcc-3.2.1~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e28bdf34c5afff82975bb51e99bee81ebdaac2d;p=thirdparty%2Fgcc.git

expr.c (expand_expr): Don't use simplify_binary_operation; check for zero operands explicitly.

        * expr.c (expand_expr) [PLUS]: Don't use simplify_binary_operation;
        check for zero operands explicitly.

From-SVN: r58622
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9229d2adb427..33b313ff3fa0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-29  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* expr.c (expand_expr) [PLUS]: Don't use simplify_binary_operation;
+	check for zero operands explicitly.
+
 2002-10-21  Dale Johannesen  <dalej@apple.com>
 
 	PR target/7133
diff --git a/gcc/expr.c b/gcc/expr.c
index a1045de2a45e..25d1fad1a3f1 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -7600,9 +7600,10 @@ expand_expr (exp, target, tmode, modifier)
 	{
 	  op0 = expand_expr (TREE_OPERAND (exp, 0), subtarget, VOIDmode, 0);
 	  op1 = expand_expr (TREE_OPERAND (exp, 1), NULL_RTX, VOIDmode, 0);
-	  temp = simplify_binary_operation (PLUS, mode, op0, op1);
-	  if (temp)
-	    return temp;
+	  if (op0 == const0_rtx)
+	    return op1;
+	  if (op1 == const0_rtx)
+	    return op0;
 	  goto binop2;
 	}