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.

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

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index ec7f2ec..05577d5 100644 (file)
--- 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
 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 (file)
--- 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;
 
             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);
          if (this_class)
            {
              tree this_decl = TYPE_NAME (this_class);