fold-const.c (fold): Revert last change.

* fold-const.c (fold): Revert last change.  It breaks constant
        expressions somehow.

From-SVN: r20441
This commit is contained in:
Richard Henderson 1998-06-12 02:34:00 -07:00 committed by Richard Henderson
parent 8d62b411cf
commit 77a45a2ea4
2 changed files with 10 additions and 17 deletions

View File

@ -1,3 +1,8 @@
Fri Jun 12 09:33:44 1998 Richard Henderson <rth@cygnus.com>
* fold-const.c (fold): Revert last change. It breaks constant
expressions somehow.
Fri Jun 12 10:23:36 1998 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* expr.c (do_jump, case EQ_EXPR, NE_EXPR): When comparing complex

View File

@ -4433,12 +4433,9 @@ fold (expr)
return convert (TREE_TYPE (t), con);
/* If ARG0 is a constant, don't change things around;
instead keep all the constant computations together.
Notice, however, if we can merge integer constants. */
instead keep all the constant computations together. */
if (TREE_CONSTANT (arg0)
&& !(TREE_CODE (con) == INTEGER_CST
&& TREE_CODE (arg1) == INTEGER_CST))
if (TREE_CONSTANT (arg0))
return t;
/* Otherwise return (CON +- ARG1) - VAR. */
@ -4453,12 +4450,9 @@ fold (expr)
return convert (TREE_TYPE (t), con);
/* If ARG0 is a constant, don't change things around;
instead keep all the constant computations together.
Notice, however, if we can merge integer constants. */
instead keep all the constant computations together. */
if (TREE_CONSTANT (arg0)
&& !(TREE_CODE (con) == INTEGER_CST
&& TREE_CODE (arg1) == INTEGER_CST))
if (TREE_CONSTANT (arg0))
return t;
/* Otherwise return VAR +- (ARG1 +- CON). */
@ -4487,13 +4481,7 @@ fold (expr)
if (split_tree (arg1, code, &var, &con, &varsign))
{
/* If ARG1 is a constant, don't change things around;
instead keep all the constant computations together.
Notice, however, if we can merge integer constants. */
if (TREE_CONSTANT (arg1)
&& !(TREE_CODE (con) == INTEGER_CST
&& TREE_CODE (arg0) == INTEGER_CST))
if (TREE_CONSTANT (arg1))
return t;
if (varsign == -1)