parse.y (fold_constant_for_init): Avoid bullish conversion.

2000-07-13  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* parse.y (fold_constant_for_init): Avoid bullish conversion.

(http://gcc.gnu.org/ml/gcc-patches/2000-07/msg00506.html)

From-SVN: r35022

gcc/java/ChangeLog

+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*}.

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:

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: