diff options
| author | Ranjit Mathew <rmathew@gcc.gnu.org> | 2005-05-27 05:15:26 +0000 |
|---|---|---|
| committer | Ranjit Mathew <rmathew@gcc.gnu.org> | 2005-05-27 05:15:26 +0000 |
| commit | 38c9d142c841e105788c13daf64902c7156a0fb3 (patch) | |
| tree | b3937d50c473e4e969f8f4dfe85d2bed7c441069 /gcc/java/jcf-write.c | |
| parent | 27358466f931ecec6692d6d4267318ed1266d729 (diff) | |
| download | gcc-38c9d142c841e105788c13daf64902c7156a0fb3.zip gcc-38c9d142c841e105788c13daf64902c7156a0fb3.tar.gz gcc-38c9d142c841e105788c13daf64902c7156a0fb3.tar.bz2 | |
re PR java/19870 (gcj -C doesn't generate accessors for private members across nested class boundaries)
PR java/19870.
* java-tree.h (OUTER_FIELD_ACCESS_IDENTIFIER_P): Rename to
NESTED_FIELD_ACCESS_IDENTIFIER_P.
(FIELD_INNER_ACCESS): Rename to FIELD_NESTED_ACCESS.
(FIELD_INNER_ACCESS_P): Rename to FIELD_NESTED_ACCESS_P.
* jcf-write.c (generate_classfile): Use
NESTED_FIELD_ACCESS_IDENTIFIER_P instead of
OUTER_FIELD_ACCESS_IDENTIFIER_P.
* parse.y (build_outer_field_access): Rename to
build_nested_field_access. Support static fields and outer-to-inner
class accesses.
(outer_field_access_p): Rename to nested_field_access_p. Support
static fields and generalise to outer-to-inner class and sibling
inner class accesses.
(outer_field_expanded_access_p): Rename to
nested_field_expanded_access_p and support static fields.
(outer_field_access_fix): Rename to nested_field_access_fix and
support static fields.
(build_outer_field_access_expr): Rename to
build_nested_field_access_expr and support static fields.
(build_outer_field_access_methods): Rename to
build_nested_field_access_methods and support static fields. For
static fields, generate accessors without class instance parameters.
(build_outer_field_access_method): Rename to
build_nested_field_access_method and support static fields.
(build_outer_method_access_method): Use
NESTED_FIELD_ACCESS_IDENTIFIER_P instead of
OUTER_FIELD_ACCESS_IDENTIFIER_P.
(resolve_expression_name): Consider static field accesses across
nested classes.
(resolve_qualified_expression_name): Likewise.
(java_complete_lhs): Use nested_field_access_fix instead of
outer_field_access_fix.
(patch_unary_op): Rename outer_field_flag to nested_field_flag.
Use nested_field_expanded_access_p instead of
outer_field_expanded_access_p. Use nested_field_access_fix instead
of outer_field_access_fix.
(check_thrown_exceptions): Use NESTED_FIELD_ACCESS_IDENTIFIER_P
instead of OUTER_FIELD_ACCESS_IDENTIFIER_P.
From-SVN: r100246
Diffstat (limited to 'gcc/java/jcf-write.c')
| -rw-r--r-- | gcc/java/jcf-write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c index 6f1516d..5deb5c8 100644 --- a/gcc/java/jcf-write.c +++ b/gcc/java/jcf-write.c @@ -3087,7 +3087,7 @@ generate_classfile (tree clas, struct jcf_partial *state) /* Make room for the Synthetic attribute (of zero length.) */ if (DECL_FINIT_P (part) || DECL_INSTINIT_P (part) - || OUTER_FIELD_ACCESS_IDENTIFIER_P (DECL_NAME (part)) + || NESTED_FIELD_ACCESS_IDENTIFIER_P (DECL_NAME (part)) || TYPE_DOT_CLASS (clas) == part) { i++; |