diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fold-const.c | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b916955..fffbf78 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Thu Mar 16 18:52:32 2000 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> + + * fold-const.c (fold): Fix a few cases when the returned result + is not of the same type as the input. + 2000-03-16 Nick Clifton <nickc@cygnus.com> * config/arm/arm.h (ASM_OUTPUT_MI_THUNK): Fix compile time diff --git a/gcc/fold-const.c b/gcc/fold-const.c index d24a7d1..904e93d 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -5226,7 +5226,7 @@ fold (expr) if (TREE_CODE (TREE_TYPE (arg0)) != COMPLEX_TYPE) return arg0; else if (TREE_CODE (arg0) == COMPLEX_EXPR) - return build (COMPLEX_EXPR, TREE_TYPE (arg0), + return build (COMPLEX_EXPR, type, TREE_OPERAND (arg0, 0), negate_expr (TREE_OPERAND (arg0, 1))); else if (TREE_CODE (arg0) == COMPLEX_CST) @@ -5525,7 +5525,7 @@ fold (expr) if (! FLOAT_TYPE_P (type)) { if (! wins && integer_zerop (arg0)) - return negate_expr (arg1); + return convert (type, negate_expr (arg1)); if (integer_zerop (arg1)) return non_lvalue (convert (type, arg0)); @@ -5548,7 +5548,7 @@ fold (expr) { /* Except with IEEE floating point, 0-x equals -x. */ if (! wins && real_zerop (arg0)) - return negate_expr (arg1); + return convert (type, negate_expr (arg1)); /* Except with IEEE floating point, x-0 equals x. */ if (real_zerop (arg1)) return non_lvalue (convert (type, arg0)); @@ -6819,7 +6819,8 @@ fold (expr) switch (comp_code) { case EQ_EXPR: - return pedantic_non_lvalue (negate_expr (arg1)); + return + pedantic_non_lvalue (convert (type, negate_expr (arg1))); case NE_EXPR: return pedantic_non_lvalue (convert (type, arg1)); case GE_EXPR: |