From: aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 3 Dec 2004 18:11:21 +0000 (+0000)
Subject: 2004-12-03  Andrew Haley  <aph@redhat.com>
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=2668ecc8ce78c9e8d1fb7797419a97d28f9811f9

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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91690 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 35217703809..9b851605110 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,5 +1,11 @@
 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.
diff --git a/gcc/java/except.c b/gcc/java/except.c
index 9ef549b3d20..6735b598311 100644
--- a/gcc/java/except.c
+++ b/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;
     }