diff options
Diffstat (limited to 'gcc/java/parse.c')
| -rw-r--r-- | gcc/java/parse.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gcc/java/parse.c b/gcc/java/parse.c index c28407e..dc04793 100644 --- a/gcc/java/parse.c +++ b/gcc/java/parse.c @@ -8195,7 +8195,12 @@ do_resolve_class (enclosing, class_type, decl, cl) if (!QUALIFIED_P (TYPE_NAME (class_type))) { tree package; - for (package = package_list; package; package = TREE_CHAIN (package)) + + /* If there is a current package (ctxp->package), it's the first + element of package_list and we can skip it. */ + for (package = (ctxp->package ? + TREE_CHAIN (package_list) : package_list); + package; package = TREE_CHAIN (package)) if ((new_class_decl = qualify_and_find (class_type, TREE_PURPOSE (package), TYPE_NAME (class_type)))) @@ -8208,9 +8213,6 @@ do_resolve_class (enclosing, class_type, decl, cl) (cl ? cl : lookup_cl (decl)))) return NULL_TREE; - if ((new_class_decl = IDENTIFIER_CLASS_VALUE (TYPE_NAME (class_type)))) - return new_class_decl; - /* 6- Last call for a resolution */ return IDENTIFIER_CLASS_VALUE (TYPE_NAME (class_type)); } @@ -14738,7 +14740,7 @@ valid_ref_assignconv_cast_p (source, dest, cast) if (TYPE_CLASS_P (dest)) return (source == dest || inherits_from_p (source, dest) - || enclosing_context_p (dest, source /*source, dest*/) + || enclosing_context_p (source, dest) || (cast && inherits_from_p (dest, source))); if (TYPE_INTERFACE_P (dest)) { |