From: Tom Tromey <tromey@gcc.gnu.org>
Date: Fri, 19 May 2000 16:10:55 +0000 (+0000)
Subject: Reverted incorrectly applied change
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9429bc4fb581ab7a065a596c1e7d5c201ced3e2c;p=gcc.git

Reverted incorrectly applied change

From-SVN: r34023
---

diff --git a/gcc/java/parse.c b/gcc/java/parse.c
index e7d5c94c492..e6bf159502b 100644
--- a/gcc/java/parse.c
+++ b/gcc/java/parse.c
@@ -17225,6 +17225,8 @@ fold_constant_for_init (node, context)
 
   if (code == INTEGER_CST || code == REAL_CST)
     return convert (TREE_TYPE (context), node);
+  if (TREE_TYPE (node) != NULL_TREE && code != VAR_DECL && code != FIELD_DECL)
+    return NULL_TREE;
 
   switch (code)
     {
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 2ac64090b32..c62e8410a03 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -14593,6 +14593,8 @@ fold_constant_for_init (node, context)
 
   if (code == INTEGER_CST || code == REAL_CST)
     return convert (TREE_TYPE (context), node);
+  if (TREE_TYPE (node) != NULL_TREE && code != VAR_DECL && code != FIELD_DECL)
+    return NULL_TREE;
 
   switch (code)
     {