diff options
Diffstat (limited to 'gcc/java/parse.y')
| -rw-r--r-- | gcc/java/parse.y | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 8cd4f00..5b8a303 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -5796,8 +5796,7 @@ do_resolve_class (tree enclosing, tree class_type, tree decl, tree cl) /* 2- And check for the type in the current compilation unit */ if ((new_class_decl = IDENTIFIER_CLASS_VALUE (TYPE_NAME (class_type)))) { - if (!CLASS_LOADED_P (TREE_TYPE (new_class_decl)) && - !CLASS_FROM_SOURCE_P (TREE_TYPE (new_class_decl))) + if (!CLASS_LOADED_P (TREE_TYPE (new_class_decl))) load_class (TYPE_NAME (class_type), 0); return IDENTIFIER_CLASS_VALUE (TYPE_NAME (class_type)); } @@ -5891,8 +5890,7 @@ qualify_and_find (tree class_type, tree package, tree name) load_class (new_qualified, 0); if ((new_class_decl = IDENTIFIER_CLASS_VALUE (new_qualified))) { - if (!CLASS_LOADED_P (TREE_TYPE (new_class_decl)) && - !CLASS_FROM_SOURCE_P (TREE_TYPE (new_class_decl))) + if (!CLASS_LOADED_P (TREE_TYPE (new_class_decl))) load_class (new_qualified, 0); TYPE_NAME (class_type) = new_qualified; return IDENTIFIER_CLASS_VALUE (new_qualified); @@ -7044,8 +7042,7 @@ find_in_imports_on_demand (tree enclosing_type, tree class_type) access_check = -1; /* If there is no DECL set for the class or if the class isn't loaded and not seen in source yet, then load */ - if (!decl || (!CLASS_LOADED_P (TREE_TYPE (decl)) - && !CLASS_FROM_SOURCE_P (TREE_TYPE (decl)))) + if (!decl || ! CLASS_LOADED_P (TREE_TYPE (decl))) { load_class (node, 0); decl = IDENTIFIER_CLASS_VALUE (node); @@ -11014,7 +11011,7 @@ find_applicable_accessible_methods_list (int lc, tree class, tree name, search_not_done++; *htab_find_slot (searched_classes, class, INSERT) = class; - if (!CLASS_LOADED_P (class) && !CLASS_FROM_SOURCE_P (class)) + if (!CLASS_LOADED_P (class)) { load_class (class, 1); safe_layout_class (class); |