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

From-SVN: r34954

Fixing a really lame patch. Sorry for the ChangeLog tweaking.)
From-SVN: r34954
e67eb1a0 · Alexandre Petit-Bianco · Alexandre Petit-Bianco · 98cd1bd5 · e67eb1a0 · e67eb1a0
Commit e67eb1a0 authored Jul 11, 2000 by Alexandre Petit-Bianco Committed by Alexandre Petit-Bianco Jul 10, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

gcc/java/ChangeLog
+3 -2

gcc/java/jcf-write.c
+1 -1

No files found.
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
-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>


--- 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++;