aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/java/ChangeLog7
-rw-r--r--gcc/java/class.c3
2 files changed, 10 insertions, 0 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index ec7f2ec..05577d5 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-13 Andrew Haley <aph@redhat.com>
+
+ 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 <hongjiu.lu@intel.com>
PR java/25330
diff --git a/gcc/java/class.c b/gcc/java/class.c
index fbf5ed2..ff2c1eb 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);