parse.y (find_as_inner_class): Follow current package indications not to mistakingly...

2001-03-26  Alexandre Petit-Bianco  <apbianco@redhat.com>

	* 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

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index a7ffcea9abd1022730d439a77fce5315a325a5fa..d1471544b7f0f4aef125d74fd8422f36c9023cf0 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-26  Alexandre Petit-Bianco  <apbianco@redhat.com>
+
+       * parse.y (find_as_inner_class): Follow current package
+       indications not to mistakingly load an unrelated class.
+
 2001-03-25  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * constants.c (PUTN): Use memcpy, not bcopy.

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 782a6536504555128b4389f7fc8b6c4a559b698a..f42d76399dedcc3e19d1ba1884a046241871e6ba 100644 (file)
--- 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