re PR java/17380 (Bad diagnostic and ICE on valid code...)

	PR java/17380:
	* parse.y (not_accessible_p): Allow access to protected members
	even when class is not static.

From-SVN: r87959

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index a33758f90f54476526185a32b12c75f1323f3602..e172f97fa979e919f3aa4ebcec31a6276a018e5c 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-23  Tom Tromey  <tromey@redhat.com>
+
+       PR java/17380:
+       * parse.y (not_accessible_p): Allow access to protected members
+       even when class is not static.
+
 2004-09-22  Kelley Cook  <kcook@gcc.gnu.org>
 
        * Make-lang.in: Revert the gcc-none.o change.

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index b221a4c9f591894c1566f522c2caec632cadeec7..a66ebd3f07b6687bb2c2d9c9b899aee834a92280 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -10065,7 +10065,7 @@ not_accessible_p (tree reference, tree member, tree where, int from_super)
             {
              if (inherits_from_p (where, reference))
                return 0;
-             if (PURE_INNER_CLASS_TYPE_P (reference))
+             if (INNER_CLASS_TYPE_P (reference))
                reference = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (reference)));
              else
                break;
@@ -10079,7 +10079,7 @@ not_accessible_p (tree reference, tree member, tree where, int from_super)
         {
           if (inherits_from_p (reference, DECL_CONTEXT (member)))
             return 0;
-         if (PURE_INNER_CLASS_TYPE_P (reference))
+         if (INNER_CLASS_TYPE_P (reference))
             reference = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (reference)));
          else
            break;