Patch for review: java.lang.Class - signers issue

[Michael Koch]

On Wed, Dec 03, 2003 at 04:01:36PM +0100, Michael Koch wrote:
Content-Description: clearsigned data
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Hi list,
> 
> 
> I wrote the attached two patches to make it possible to compile 
> classpath with gcj again. I see these patches as start for a 
> discussion of this problem. These patches fix PR/12768 which is a 
> regression from 3.3.

As Andreas Tobler pointed out in a private mail I used the wrong
ChangeLog file for the gcj patch. The attached patch fixes this.


Michael
-------------- next part --------------
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/ChangeLog,v
retrieving revision 1.1295
diff -u -b -B -r1.1295 ChangeLog
--- ChangeLog	18 Nov 2003 03:57:08 -0000	1.1295
+++ ChangeLog	3 Dec 2003 14:13:32 -0000
@@ -1,3 +1,10 @@
+2003-12-03  Michael Koch  <konqueror@gmx.de>
+
+	* class.c (make_class_data):
+	Push field value to 'hack_signers' instead of 'signers'.
+	* decl.c (java_init_decl_processing):
+	Push field 'hack_signers' instead of 'signers'.
+
 2003-11-17  Jeff Sturm  <jsturm@one-point.com>
 
 	Fix PR java/12857.
Index: class.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/class.c,v
retrieving revision 1.172
diff -u -b -B -r1.172 class.c
--- class.c	24 Oct 2003 09:29:40 -0000	1.172
+++ class.c	3 Dec 2003 14:13:33 -0000
@@ -1568,7 +1568,7 @@
   PUSH_FIELD_VALUE (cons, "idt", null_pointer_node);
   PUSH_FIELD_VALUE (cons, "arrayclass", null_pointer_node);
   PUSH_FIELD_VALUE (cons, "protectionDomain", null_pointer_node);
-  PUSH_FIELD_VALUE (cons, "signers", null_pointer_node);
+  PUSH_FIELD_VALUE (cons, "hack_signers", null_pointer_node);
   PUSH_FIELD_VALUE (cons, "chain", null_pointer_node);
 
   FINISH_RECORD_CONSTRUCTOR (cons);
Index: decl.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/decl.c,v
retrieving revision 1.171
diff -u -b -B -r1.171 decl.c
--- decl.c	18 Nov 2003 03:57:08 -0000	1.171
+++ decl.c	3 Dec 2003 14:13:34 -0000
@@ -728,7 +728,7 @@
   PUSH_FIELD (class_type_node, field, "idt", ptr_type_node);  
   PUSH_FIELD (class_type_node, field, "arrayclass", ptr_type_node);  
   PUSH_FIELD (class_type_node, field, "protectionDomain", ptr_type_node);
-  PUSH_FIELD (class_type_node, field, "signers", ptr_type_node);
+  PUSH_FIELD (class_type_node, field, "hack_signers", ptr_type_node);
   PUSH_FIELD (class_type_node, field, "chain", ptr_type_node);
   for (t = TYPE_FIELDS (class_type_node);  t != NULL_TREE;  t = TREE_CHAIN (t))
     FIELD_PRIVATE (t) = 1;