diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/java/parse.c | 5 | ||||
| -rw-r--r-- | gcc/java/parse.y | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 4857d01..b341bba 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2000-07-13 Alexandre Petit-Bianco <apbianco@cygnus.com> + + * parse.y (fold_constant_for_init): Avoid bullish conversion. + 2000-07-13 Tom Tromey <tromey@cygnus.com> * lang-specs.h: Added %{I*}. diff --git a/gcc/java/parse.c b/gcc/java/parse.c index 5133edf..f1cd122 100644 --- a/gcc/java/parse.c +++ b/gcc/java/parse.c @@ -17508,12 +17508,9 @@ fold_constant_for_init (node, context) tree op0, op1, val; enum tree_code code = TREE_CODE (node); - if (code == STRING_CST) + if (code == STRING_CST || code == INTEGER_CST || code == REAL_CST) return node; - if (code == INTEGER_CST || code == REAL_CST) - return convert (TREE_TYPE (context), node); - switch (code) { case PLUS_EXPR: diff --git a/gcc/java/parse.y b/gcc/java/parse.y index f062016..c13eb4b 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -14810,12 +14810,9 @@ fold_constant_for_init (node, context) tree op0, op1, val; enum tree_code code = TREE_CODE (node); - if (code == STRING_CST) + if (code == STRING_CST || code == INTEGER_CST || code == REAL_CST) return node; - if (code == INTEGER_CST || code == REAL_CST) - return convert (TREE_TYPE (context), node); - switch (code) { case PLUS_EXPR: |