From 65260edb31003a77a2f8aa6c0399ee904a0a4ca7 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Tue, 13 Dec 2005 09:41:45 +0000 Subject: [PATCH] re PR java/25366 (ICE in do_resolve_class) 2005-12-13 Andrew Haley PR java/25366 PR java/25368 * class.c (maybe_layout_super_class): Update current_class before calling do_resolve_class. From-SVN: r108474 --- gcc/java/ChangeLog | 7 +++++++ gcc/java/class.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index ec7f2ececb8..05577d5dc47 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,10 @@ +2005-12-13 Andrew Haley + + PR java/25366 + PR java/25368 + * class.c (maybe_layout_super_class): Update current_class before + calling do_resolve_class. + 2005-12-12 H.J. Lu PR java/25330 diff --git a/gcc/java/class.c b/gcc/java/class.c index fbf5ed204c6..ff2c1eb5128 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -2085,6 +2085,9 @@ maybe_layout_super_class (tree super_class, tree this_class) we give it one. */ tree this_wrap = NULL_TREE; + /* Set the correct context for class resolution. */ + current_class = this_class; + if (this_class) { tree this_decl = TYPE_NAME (this_class); -- 2.30.2