From ce06965e6a9c46d6896ccb8a4553852a230c95fc Mon Sep 17 00:00:00 2001 From: Alexandre Petit-Bianco Date: Mon, 26 Mar 2001 14:12:16 -0800 Subject: [PATCH] parse.y (find_as_inner_class): Follow current package indications not to mistakingly load an unrelated class. 2001-03-26 Alexandre Petit-Bianco * parse.y (find_as_inner_class): Follow current package indications not to mistakingly load an unrelated class. (http://gcc.gnu.org/ml/gcc-patches/2001-03/msg01712.html) From-SVN: r40851 --- gcc/java/ChangeLog | 5 +++++ gcc/java/parse.y | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index a7ffcea9abd..d1471544b7f 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2001-03-26 Alexandre Petit-Bianco + + * parse.y (find_as_inner_class): Follow current package + indications not to mistakingly load an unrelated class. + 2001-03-25 Kaveh R. Ghazi * constants.c (PUTN): Use memcpy, not bcopy. diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 782a6536504..f42d76399de 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -3521,7 +3521,18 @@ find_as_inner_class (enclosing, name, cl) acc = merge_qualified_name (acc, EXPR_WFL_NODE (TREE_PURPOSE (qual))); BUILD_PTR_FROM_NAME (ptr, acc); - decl = do_resolve_class (NULL_TREE, ptr, NULL_TREE, cl); + + /* Don't try to resolve ACC as a class name if it follows + the current package name. We don't want to pick something + that's accidentally there: for example `a.b.c' in package + `a.b' shouldn't trigger loading `a' if it's there by + itself. */ + if (ctxp->package + && strstr (IDENTIFIER_POINTER (ctxp->package), + IDENTIFIER_POINTER (acc))) + decl = NULL; + else + decl = do_resolve_class (NULL_TREE, ptr, NULL_TREE, cl); } /* A NULL qual and a decl means that the search ended -- 2.30.2