parse.y (resolve_qualified_expression_name): Pass field's DECL_CONTEXT to `not_access...

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

        * parse.y (resolve_qualified_expression_name): Pass field's
        DECL_CONTEXT to `not_accessible_p.'
        (not_accessible_p): Changed parameters order in `inherits_from_p'
        invokation.

(http://gcc.gnu.org/ml/gcc-patches/2001-04/msg00326.html)

From-SVN: r41126

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 252fc040f249a39c119e04581e7d085e1187f543..834aed6269578ab2f0130f601d038d7f99337a84 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-04  Alexandre Petit-Bianco  <apbianco@redhat.com>
+ 
+       * parse.y (resolve_qualified_expression_name): Pass field's
+       DECL_CONTEXT to `not_accessible_p.'
+       (not_accessible_p): Changed parameters order in `inherits_from_p'
+       invokation.
+
 2001-03-27  Andrew Haley  <aph@cambridge.redhat.com>
 
        * lang-options.h: Add flag_check_references.

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 40e78011e1cdfbae5bfa632414049c846a75e345..4ab60e9f6a63706d706d4e059773a8c95c2ece8b 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -9434,7 +9434,7 @@ resolve_qualified_expression_name (wfl, found_decl, where_found, type_found)
              
              /* Check on accessibility here */
              if (not_accessible_p (current_class, field_decl,
-                                   TREE_TYPE (decl), from_super))
+                                   DECL_CONTEXT (field_decl), from_super))
                {
                  parse_error_context 
                    (qual_wfl,
@@ -9559,7 +9559,7 @@ not_accessible_p (reference, member, where, from_super)
       /* If where is active, access was made through a
         qualifier. Access is granted if the type of the qualifier is
         or is a sublass of the type the access made from (6.6.2.1.)  */
-      if (where && !inherits_from_p (where, reference))
+      if (where && !inherits_from_p (reference, where))
        return 1;
 
       /* Otherwise, access is granted if occuring from the class where