diff options
| author | Paolo Bonzini <bonzini@gcc.gnu.org> | 2005-05-10 13:23:35 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gcc.gnu.org> | 2005-05-10 13:23:35 +0000 |
| commit | 27e928edee9751a937bbd0bd175f233cd4581b63 (patch) | |
| tree | feb534487f7c16b52aaa30fbe27ccd9255bc7194 /gcc/java/class.c | |
| parent | 2798c11f46535b4581da39ed747dd07f02085ae5 (diff) | |
| download | gcc-27e928edee9751a937bbd0bd175f233cd4581b63.zip gcc-27e928edee9751a937bbd0bd175f233cd4581b63.tar.gz gcc-27e928edee9751a937bbd0bd175f233cd4581b63.tar.bz2 | |
re PR java/21436 (imports not remembered for previously compiled files)
gcc/java:
2005-05-10 Paolo Bonzini <bonzini@gnu.org>
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 <bonzini@gnu.org>
PR java/21436
* testsuite/libjava.jacks/jacks.xfail: Adjust.
From-SVN: r99513
Diffstat (limited to 'gcc/java/class.c')
| -rw-r--r-- | gcc/java/class.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/java/class.c b/gcc/java/class.c index 321c1e4..9ab8857 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -2085,7 +2085,7 @@ maybe_layout_super_class (tree super_class, tree this_class) DECL_SOURCE_LINE (this_decl), 0); #endif } - super_class = do_resolve_class (NULL_TREE, /* FIXME? */ + super_class = do_resolve_class (NULL_TREE, this_class, super_class, NULL_TREE, this_wrap); if (!super_class) return NULL_TREE; /* FIXME, NULL_TREE not checked by caller. */ |