re GNATS gcj/172 (compiler rejects inner-class argument to inner-class constructor)

Tue Mar 14 17:15:41 2000  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* 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

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 7e3e4d335c1b8e0c8e7e65c4733dab653b997614..ecda52703ae492fe13a1ff33dc859243fde95b91 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 14 17:15:41 2000  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+       * parse.y (register_incomplete_type): Fixed initialization of
+       JDEP_ENCLOSING.
+
 2000-02-14  Andrew Haley  <aph@cygnus.com>
 
         * 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 bb08b44f520be29f392bb474bef51e20646bb53d..f4d314362b8df5ac28c4b28283df3ae859196b27 100644 (file)
--- 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 4ef7752c3cf6e33f140942e7459c0d275910be0a..0ccb63027a3d6ffcef9e5156f8e4e04a62313dbb 100644 (file)
--- 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);