From be0c7ff4050a473ce2d989b7ab7ac85fc640490c Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Thu, 30 Aug 2001 21:14:44 -0700 Subject: [PATCH] jcf-write.c (generate_classfile): Check that field is primitive or string before emitting ConstantValue attribute. * jcf-write.c (generate_classfile): Check that field is primitive or string before emitting ConstantValue attribute. From-SVN: r45306 --- gcc/java/ChangeLog | 5 +++++ gcc/java/jcf-write.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 0d9f4c52e4b..b06dd57aa46 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2001-08-30 Per Bothner + + * jcf-write.c (generate_classfile): Check that field is primitive + or string before emitting ConstantValue attribute. + 2001-08-30 Per Bothner * parse.y (resolve_qualified_expression_name): If creating a diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c index d090b5678ae..026ceb5d068 100644 --- a/gcc/java/jcf-write.c +++ b/gcc/java/jcf-write.c @@ -2885,7 +2885,9 @@ generate_classfile (clas, state) PUT2(i); have_value = DECL_INITIAL (part) != NULL_TREE && FIELD_STATIC (part) && CONSTANT_VALUE_P (DECL_INITIAL (part)) - && FIELD_FINAL (part); + && FIELD_FINAL (part) + && (JPRIMITIVE_TYPE_P (TREE_TYPE (part)) + || TREE_TYPE (part) == string_ptr_type_node); if (have_value) attr_count++; -- 2.30.2