From 67dd4de462d7aab2b4a91d9fbcde881992e31c80 Mon Sep 17 00:00:00 2001 From: bonzini Date: Tue, 10 May 2005 13:23:35 +0000 Subject: gcc/java: 2005-05-10 Paolo Bonzini PR java/21436 * class.c (maybe_layout_super_class): Look for imports in this_class. * parse.h (ctxp_for_generation_last): New. (do_resolve_class): Add a parameter. * parse.y (ctxp_for_generation_last): New. (java_pop_parser_context): Add at end of list. (find_in_imports, find_in_imports_on_demand): Look in ctxp if the TYPE_IMPORT_LIST or respectively the TYPE_IMPORT_DEMAND_LIST of the given type are NULL. (do_resolve_class): Look into the imports of the new second parameter. Adjust recursive calls. (resolve_class, resolve_inner_class, find_as_inner_class): Adjust calls to do_resolve_class. (create_class): Set the TYPE_IMPORT_LIST and TYPE_IMPORT_DEMAND_LIST. (java_complete_class): Do not do that here. libjava: 2005-05-10 Paolo Bonzini PR java/21436 * testsuite/libjava.jacks/jacks.xfail: Adjust. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99513 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/java/parse.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gcc/java/parse.h') diff --git a/gcc/java/parse.h b/gcc/java/parse.h index 5948348895a..232eead9862 100644 --- a/gcc/java/parse.h +++ b/gcc/java/parse.h @@ -937,7 +937,7 @@ void java_layout_classes (void); void java_reorder_fields (void); tree java_method_add_stmt (tree, tree); int java_report_errors (void); -extern tree do_resolve_class (tree, tree, tree, tree); +extern tree do_resolve_class (tree, tree, tree, tree, tree); #endif char *java_get_line_col (const char *, int, int); extern void reset_report (void); @@ -960,5 +960,6 @@ extern void java_finish_classes (void); extern GTY(()) struct parser_ctxt *ctxp; extern GTY(()) struct parser_ctxt *ctxp_for_generation; +extern GTY(()) struct parser_ctxt *ctxp_for_generation_last; #endif /* ! GCC_JAVA_PARSE_H */ -- cgit v1.2.3