aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2004-09-23 16:21:31 +0000
committerTom Tromey <tromey@gcc.gnu.org>2004-09-23 16:21:31 +0000
commit2fc8ee77e02057b43adc93e2f28be0ff8ca17758 (patch)
tree67afffa93752588513dd82b2a1cfc6abf01a82b2
parent53d26678b908e20861631ee58f78e0379893e39d (diff)
downloadgcc-2fc8ee77e02057b43adc93e2f28be0ff8ca17758.zip
gcc-2fc8ee77e02057b43adc93e2f28be0ff8ca17758.tar.gz
gcc-2fc8ee77e02057b43adc93e2f28be0ff8ca17758.tar.bz2
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
-rw-r--r--gcc/java/ChangeLog6
-rw-r--r--gcc/java/parse.y4
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index a33758f..e172f97 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 b221a4c..a66ebd3 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;