From: Tom Tromey <tromey@redhat.com>
Date: Thu, 23 Sep 2004 16:21:31 +0000 (+0000)
Subject: re PR java/17380 (Bad diagnostic and ICE on valid code...)
X-Git-Tag: releases/gcc-4.0.0~4678
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fc8ee77e02057b43adc93e2f28be0ff8ca17758;p=thirdparty%2Fgcc.git

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 a33758f90f54..e172f97fa979 100644
--- 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 b221a4c9f591..a66ebd3f07b6 100644
--- 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;