aboutsummaryrefslogtreecommitdiff
path: root/gcc/java/class.c
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2005-08-16 16:06:43 +0000
committerTom Tromey <tromey@gcc.gnu.org>2005-08-16 16:06:43 +0000
commit33173fd40fa6fa47d85c9dfa169ad4dcb3916a3b (patch)
tree7c0b6e95a8ebdb28fbcfca41cd2acb48d5f938f6 /gcc/java/class.c
parentce45ef468cb3183890e4a159b9757bf640216558 (diff)
downloadgcc-33173fd40fa6fa47d85c9dfa169ad4dcb3916a3b.zip
gcc-33173fd40fa6fa47d85c9dfa169ad4dcb3916a3b.tar.gz
gcc-33173fd40fa6fa47d85c9dfa169ad4dcb3916a3b.tar.bz2
re PR java/23300 (DECL_FIELD_OFFSET == 0 versus build_field_ref)
PR java/23300. * expr.c (build_field_ref): Don't generate otable reference when DECL_FIELD_OFFSET is 0. * class.c (maybe_layout_super_class): Pass outer class to do_resolve_class. From-SVN: r103160
Diffstat (limited to 'gcc/java/class.c')
-rw-r--r--gcc/java/class.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/java/class.c b/gcc/java/class.c
index d7e22c2..21945eb 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -2093,8 +2093,9 @@ maybe_layout_super_class (tree super_class, tree this_class)
DECL_SOURCE_LINE (this_decl), 0);
#endif
}
- super_class = do_resolve_class (NULL_TREE, this_class,
- super_class, NULL_TREE, this_wrap);
+ super_class
+ = do_resolve_class (DECL_CONTEXT (TYPE_NAME (this_class)),
+ this_class, super_class, NULL_TREE, this_wrap);
if (!super_class)
return NULL_TREE; /* FIXME, NULL_TREE not checked by caller. */
super_class = TREE_TYPE (super_class);