re PR java/18812 (ICE in catalina/common/lib/naming-resources.jar)

2004-12-03  Andrew Haley  <aph@redhat.com>

	PR java/18812
	* except.c (link_handler): Patch 'outer' field of siblings of the
	range we're demoting.

From-SVN: r91690

gcc/java/ChangeLog

 2004-12-03  Andrew Haley  <aph@redhat.com>
 
+	PR java/18812
+	* except.c (link_handler): Patch 'outer' field of siblings of the
+	range we're demoting.
+
+2004-12-03  Andrew Haley  <aph@redhat.com>
+
 	PR java/18697 
 	* class.c (layout_class_method): Don't fail to override a method
 	simply because it has DECL_ARTIFICIAL set.

gcc/java/except.c

@@ -138,12 +138,18 @@ link_handler (struct eh_range *range, struct eh_range *outer)
       range->next_sibling = NULL;
       range->first_child = outer;
       {
+	struct eh_range *p = outer;
 	struct eh_range **pr = &(outer->outer->first_child);
 	while (*pr != outer)
 	  pr = &(*pr)->next_sibling;
 	*pr = range;
+
+	while (p)
+	  {
+	    p->outer = range;
+	    p = p->next_sibling;
+	  }
       }
-      outer->outer = range;
       return;
     }