class.c (set_constant_value): When not emiting class files, then a String ConstantValue is a utf8const_ptr_type.

* class.c (set_constant_value):  When not emiting class files, then a
	String ConstantValue is a utf8const_ptr_type.

From-SVN: r45333
This commit is contained in:
Per Bothner 2001-08-31 13:07:31 -07:00 committed by Per Bothner
parent 6268b92246
commit 289b57ee28
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2001-08-31 Per Bothner <per@bothner.com>
* class.c (set_constant_value): When not emiting class files, then a
String ConstantValue is a utf8const_ptr_type.
2001-08-30 Per Bothner <per@bothner.com> 2001-08-30 Per Bothner <per@bothner.com>
* jcf-write.c (generate_classfile): Check that field is primitive * jcf-write.c (generate_classfile): Check that field is primitive

View File

@ -780,8 +780,10 @@ set_constant_value (field, constant)
if (TREE_TYPE (constant) != TREE_TYPE (field) if (TREE_TYPE (constant) != TREE_TYPE (field)
&& ! (TREE_TYPE (constant) == int_type_node && ! (TREE_TYPE (constant) == int_type_node
&& INTEGRAL_TYPE_P (TREE_TYPE (field)) && INTEGRAL_TYPE_P (TREE_TYPE (field))
&& TYPE_PRECISION (TREE_TYPE (field)) <= 32)) && TYPE_PRECISION (TREE_TYPE (field)) <= 32)
warning ("ConstantValue attribute of field '%s' has wrong type", && ! (TREE_TYPE (constant) == utf8const_ptr_type
&& TREE_TYPE (field) == string_ptr_type_node))
error ("ConstantValue attribute of field '%s' has wrong type",
IDENTIFIER_POINTER (DECL_NAME (field))); IDENTIFIER_POINTER (DECL_NAME (field)));
if (FIELD_FINAL (field)) if (FIELD_FINAL (field))
DECL_FIELD_FINAL_IUD (field) = 1; DECL_FIELD_FINAL_IUD (field) = 1;