From 324ed8fdf2a3a7a6509ae1db9ca6bf877e24b96c Mon Sep 17 00:00:00 2001 From: Alexandre Petit-Bianco Date: Wed, 15 Mar 2000 09:30:39 +0000 Subject: [PATCH] re GNATS gcj/172 (compiler rejects inner-class argument to inner-class constructor) Tue Mar 14 17:15:41 2000 Alexandre Petit-Bianco * parse.y (register_incomplete_type): Fixed initialization of JDEP_ENCLOSING. (This is a fix to the gcj PR #172: http://sourceware.cygnus.com/ml/java-prs/2000-q1/msg00169.html) From-SVN: r32556 --- gcc/java/ChangeLog | 5 +++++ gcc/java/parse.c | 3 ++- gcc/java/parse.y | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 7e3e4d335c1..ecda52703ae 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 14 17:15:41 2000 Alexandre Petit-Bianco + + * parse.y (register_incomplete_type): Fixed initialization of + JDEP_ENCLOSING. + 2000-02-14 Andrew Haley * check-init.c (check_init): Add new cases for unary and binary diff --git a/gcc/java/parse.c b/gcc/java/parse.c index bb08b44f520..f4d314362b8 100644 --- a/gcc/java/parse.c +++ b/gcc/java/parse.c @@ -7581,7 +7581,8 @@ register_incomplete_type (kind, wfl, decl, ptr) JDEP_WFL (new) = wfl; JDEP_CHAIN (new) = NULL; JDEP_MISC (new) = NULL_TREE; - JDEP_ENCLOSING (new) = GET_CPC (); + if(!(JDEP_ENCLOSING (new) = GET_ENCLOSING_CPC_CONTEXT ())) + JDEP_ENCLOSING (new) = GET_CPC (); JDEP_GET_PATCH (new) = (tree *)NULL; JDEP_INSERT (ctxp->classd_list, new); diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 4ef7752c3cf..0ccb63027a3 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -4883,7 +4883,8 @@ register_incomplete_type (kind, wfl, decl, ptr) JDEP_WFL (new) = wfl; JDEP_CHAIN (new) = NULL; JDEP_MISC (new) = NULL_TREE; - JDEP_ENCLOSING (new) = GET_CPC (); + if(!(JDEP_ENCLOSING (new) = GET_ENCLOSING_CPC_CONTEXT ())) + JDEP_ENCLOSING (new) = GET_CPC (); JDEP_GET_PATCH (new) = (tree *)NULL; JDEP_INSERT (ctxp->classd_list, new); -- 2.30.2