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

	* parse.y (resolve_inner_class): Keep local_enclosing to NULL if
	circularity is detected.
	(ctors_unchecked_throws_clause_p): Fixed leading comment.

(http://gcc.gnu.org/ml/gcc-patches/2001-08/msg01283.html)

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45109 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 8c2b791..e763b18 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-22  Alexandre Petit-Bianco  <apbianco@redhat.com>
+
+       * parse.y (resolve_inner_class): Keep local_enclosing to NULL if
+       circularity is detected.
+       (ctors_unchecked_throws_clause_p): Fixed leading comment.
+
 2001-08-17  Richard Henderson  <rth@redhat.com>
 
        * class.c (emit_register_classes): Add align parameter to

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index b4eb930..d35a47d 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -3584,7 +3584,8 @@ resolve_inner_class (circularity_hash, cl, enclosing, super, class_type)
             IDENTIFIER_POINTER (DECL_NAME (local_enclosing)));
          local_enclosing = NULL_TREE;
         }
-      local_enclosing = local_super;
+      else
+       local_enclosing = local_super;
     }
 
   /* We failed. Return LOCAL_SUPER and LOCAL_ENCLOSING. */
@@ -15701,7 +15702,7 @@ purge_unchecked_exceptions (mdecl)
 }
 
 /* This function goes over all of CLASS_TYPE ctors and checks whether
-   each of then features at least one unchecked exception in it
+   each of them features at least one unchecked exception in its
    `throws' clause. If it's the case, it returns `true', `false'
    otherwise.  */