re PR middle-end/41814 (ICE in jc1 during bootstrap of gcj)

2009-10-25 Richard Guenther <rguenther@suse.de> PR middle-end/41814 * tree.c (find_decls_types_r): Deal with Java overloading BINFO_VIRTUALS for its own purpose. From-SVN: r153539

re PR middle-end/41814 (ICE in jc1 during bootstrap of gcj)
2009-10-25 Richard Guenther <rguenther@suse.de> PR middle-end/41814 * tree.c (find_decls_types_r): Deal with Java overloading BINFO_VIRTUALS for its own purpose. From-SVN: r153539
22dfb60e · Richard Guenther · Richard Biener · 8af9d17f · 22dfb60e · 22dfb60e
Commit 22dfb60e authored Oct 25, 2009 by Richard Guenther Committed by Richard Biener Oct 25, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 5 deletions

gcc/ChangeLog
+6 -0

gcc/tree.c
+9 -5

No files found.
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
+2009-10-25  Richard Guenther  <rguenther@suse.de>
+	PR middle-end/41814
+	* tree.c (find_decls_types_r): Deal with Java overloading
+	BINFO_VIRTUALS for its own purpose.
 2009-10-24  Adam Nemet  <anemet@caviumnetworks.com>
 	* config/mips/predicates.md (hilo_operand): New predicate.
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -4648,11 +4648,15 @@ find_decls_types_r (tree *tp, int *ws, void *data)
 				   i, tem); ++i)
 	    fld_worklist_push (TREE_TYPE (tem), fld);
 	  tem = BINFO_VIRTUALS (TYPE_BINFO (t));
-	  while (tem)
+	  if (tem
-	    {
+	      /* The Java FE overloads BINFO_VIRTUALS for its own purpose.  */
-	      fld_worklist_push (TREE_VALUE (tem), fld);
+	      && TREE_CODE (tem) == TREE_LIST)
-	      tem = TREE_CHAIN (tem);
+	    do
-	    }
+	      {
+		fld_worklist_push (TREE_VALUE (tem), fld);
+		tem = TREE_CHAIN (tem);
+	      }
+	    while (tem);
 	}
      if (RECORD_OR_UNION_TYPE_P (t))
 	{