From: Per Bothner <per@bothner.com>
Date: Fri, 31 Aug 2001 20:07:31 +0000 (-0700)
Subject: class.c (set_constant_value): When not emiting class files, then a String ConstantVal... 
X-Git-Tag: prereleases/libstdc++-3.0.95~2311
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=289b57ee28d0deca5af21333eca23557245a7f08;p=thirdparty%2Fgcc.git

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

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index b06dd57aa469..2a89caeefdd0 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -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>
 
 	* jcf-write.c (generate_classfile):  Check that field is primitive
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 9aa536640289..6086fc0db767 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -780,8 +780,10 @@ set_constant_value (field, constant)
       if (TREE_TYPE (constant) != TREE_TYPE (field)
 	  && ! (TREE_TYPE (constant) == int_type_node
 		&& INTEGRAL_TYPE_P (TREE_TYPE (field))
-		&& TYPE_PRECISION (TREE_TYPE (field)) <= 32))
-	warning ("ConstantValue attribute of field '%s' has wrong type",
+		&& TYPE_PRECISION (TREE_TYPE (field)) <= 32)
+	  && ! (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)));
       if (FIELD_FINAL (field))
 	DECL_FIELD_FINAL_IUD (field) = 1;