diff options
| author | Alexandre Petit-Bianco <apbianco@cygnus.com> | 2000-07-11 04:00:14 +0000 |
|---|---|---|
| committer | Alexandre Petit-Bianco <apbianco@gcc.gnu.org> | 2000-07-10 21:00:14 -0700 |
| commit | e67eb1a0f566e454672799ef3bbd499ecd948526 (patch) | |
| tree | 5fbc63400a57568288a3b79f73cac3d00816d6db | |
| parent | 98cd1bd53e4be7312eb209a1e92294eecd5a1231 (diff) | |
| download | gcc-e67eb1a0f566e454672799ef3bbd499ecd948526.zip gcc-e67eb1a0f566e454672799ef3bbd499ecd948526.tar.gz gcc-e67eb1a0f566e454672799ef3bbd499ecd948526.tar.bz2 | |
Fixing a really lame patch. Sorry for the ChangeLog tweaking.)
From-SVN: r34954
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/jcf-write.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 1241408..a733757 100644 --- 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 0dd17fd..538c1a2 100644 --- 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++; |