From 2f2bd00a8f84d78a80801bcb9c1df3d0c6d45a39 Mon Sep 17 00:00:00 2001 From: Alexandre Petit-Bianco Date: Sat, 8 Jul 2000 06:23:02 +0000 Subject: [PATCH] parse.y (generate_classfile): Exclude null strings. 2000-07-07 Alexandre Petit-Bianco * parse.y (generate_classfile): Exclude null strings. (http://gcc.gnu.org/ml/gcc-patches/2000-07/msg00233.html) From-SVN: r34923 --- gcc/java/ChangeLog | 4 ++++ gcc/java/jcf-write.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 42368c0ab99..1241408a99f 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2000-07-07 Alexandre Petit-Bianco + + * parse.y (generate_classfile): Exclude null strings. + 2000-07-07 Alexandre Petit-Bianco * jcf-write.c (generate_classfile): Properly install the diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c index 0d2a0388784..0dd17fdde93 100644 --- a/gcc/java/jcf-write.c +++ b/gcc/java/jcf-write.c @@ -2877,7 +2877,8 @@ generate_classfile (clas, state) have_value = DECL_INITIAL (part) != NULL_TREE && FIELD_STATIC (part) && (TREE_CODE (DECL_INITIAL (part)) == STRING_CST - || TREE_CODE (DECL_INITIAL (part)) == INTEGER_CST + || (TREE_CODE (DECL_INITIAL (part)) == INTEGER_CST + && !TREE_TYPE (part) == string_type_node) || TREE_CODE (DECL_INITIAL (part)) == REAL_CST); if (have_value) attr_count++;