Fixing a really lame patch. Sorry for the ChangeLog tweaking.)

From-SVN: r34954

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 1241408a99fbd77e9c557da05cb1224fc0990a53..a733757b284f52dbfdc7212de727f1d75d9eb353 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,6 +1,7 @@
-2000-07-07  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+2000-07-10  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
-       * parse.y (generate_classfile): Exclude null strings.
+       * jcf-write.c (generate_classfile): Don't install ConstantValue
+       for null pointers.
 
 2000-07-07  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 

diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c
index 0dd17fdde93319890301b2cd612834435263159b..538c1a24f547da9381772d0399b335f84f245668 100644 (file)
--- a/gcc/java/jcf-write.c
+++ b/gcc/java/jcf-write.c
@@ -2878,7 +2878,7 @@ generate_classfile (clas, state)
        && FIELD_STATIC (part)
        && (TREE_CODE (DECL_INITIAL (part)) == STRING_CST
            || (TREE_CODE (DECL_INITIAL (part)) == INTEGER_CST
-               && !TREE_TYPE (part) == string_type_node)
+               && TREE_CODE (TREE_TYPE (DECL_INITIAL (part))) != POINTER_TYPE)
            || TREE_CODE (DECL_INITIAL (part)) == REAL_CST);
       if (have_value)
        attr_count++;