aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/fold-const.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bfa8e95..8288483 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-11 Tom Tromey <tromey@redhat.com>
+
+ For PR java/6520:
+ * fold-const.c (fold_convert): Don't modify existing tree's type.
+
2002-06-11 Geoffrey Keating <geoffk@redhat.com>
* config/rs6000/ppc-asm.h: Remove some Windows NT leftovers.
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index db41564..1c29ad5 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -1596,8 +1596,10 @@ fold_convert (t, arg1)
{
if (REAL_VALUE_ISNAN (TREE_REAL_CST (arg1)))
{
- t = arg1;
- TREE_TYPE (arg1) = type;
+ /* We make a copy of ARG1 so that we don't modify an
+ existing constant tree. */
+ t = copy_node (arg1);
+ TREE_TYPE (t) = type;
return t;
}