summaryrefslogtreecommitdiff
path: root/gcc/java/jcf-parse.c
diff options
context:
space:
mode:
authorapbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4>2000-07-27 11:13:51 +0000
committerapbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4>2000-07-27 11:13:51 +0000
commitced3ce4a5f4b390068da040c6c87a5bf2923c450 (patch)
tree678d65d867747419c99f55f70ac58873882c5de3 /gcc/java/jcf-parse.c
parentc72665e96a80d5c12fb98f16e60f3e8f7c3cee49 (diff)
downloadgcc-ced3ce4a5f4b390068da040c6c87a5bf2923c450.tar.gz
2000-07-25 Alexandre Petit-Bianco <apbianco@cygnus.com>
* parse.y (jdep_resolve_class): Don't bother checking potential innerclass access if `decl' is NULL. (find_in_imports_on_demand): TREE_PURPOSE of `import' contains the WFL. 2000-07-24 Alexandre Petit-Bianco <apbianco@cygnus.com> * parse.y (find_as_inner_class): Removed 2000-07-19 patches. * jcf-parse.c (HANDLE_INNERCLASSES_ATTRIBUTE): Local `decl' moved outside the `if' statement, alias to innerclass removed, `decl' used to mark the class complete. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35287 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/jcf-parse.c')
-rw-r--r--gcc/java/jcf-parse.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index bd41b8b8ab7..78bf52139e3 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -192,19 +192,18 @@ set_source_filename (jcf, index)
int c = (count); \
while (c--) \
{ \
- tree class = get_class_constant (jcf, JCF_readu2 (jcf)); \
- if (DECL_P (class) && !CLASS_COMPLETE_P (class)) \
+ tree class = get_class_constant (jcf, JCF_readu2 (jcf)); \
+ tree decl = TYPE_NAME (class); \
+ if (DECL_P (decl) && !CLASS_COMPLETE_P (decl)) \
{ \
tree outer = TYPE_NAME (get_class_constant (jcf, \
JCF_readu2 (jcf))); \
tree alias = get_name_constant (jcf, JCF_readu2 (jcf)); \
- tree decl = TYPE_NAME (class); \
JCF_SKIP (jcf, 2); \
- IDENTIFIER_GLOBAL_VALUE (alias) = decl; \
DECL_CONTEXT (decl) = outer; \
DECL_INNER_CLASS_LIST (outer) = \
tree_cons (decl, alias, DECL_INNER_CLASS_LIST (outer)); \
- CLASS_COMPLETE_P (class) = 1; \
+ CLASS_COMPLETE_P (decl) = 1; \
} \
else \
JCF_SKIP (jcf, 6); \