jcf-parse.c (load_inner_classes): Check CLASS_LOADED_P before trying to load an inner...

	* jcf-parse.c (load_inner_classes):  Check CLASS_LOADED_P
	before trying to load an inner class.

From-SVN: r40638

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 77f98ca210d6f9f52d7c2f26e59daf6d91a30651..2a96eb553f66149eaff68e768ecd648665d36a6b 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-19  Per Bothner  <per@bothner.com>
 
+       * jcf-parse.c (load_inner_classes):  Check CLASS_LOADED_P
+       before trying to load an inner class.
+
        Fixes to process to command-line .class files in two passes.
        * java-tree.h (JAVA_FILE_P, CLASS_FILE_P, ZIP_FILE_P):  New flags.
        (CLASS_FROM_CURRENTLY_COMPILED_SOURCE_P):  Rename to ..

diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 84f268878cbd273a48007690bd61aeaf70dd3513..4dff49bcfc70c625c83317c162c3347a616715e0 100644 (file)
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -728,7 +728,8 @@ load_inner_classes (cur_class)
     {
       tree name = DECL_NAME (TREE_PURPOSE (current));
       tree decl = IDENTIFIER_GLOBAL_VALUE (name);
-      if (decl && !CLASS_BEING_LAIDOUT (TREE_TYPE (decl)))
+      if (decl && ! CLASS_LOADED_P (TREE_TYPE (decl))
+         && !CLASS_BEING_LAIDOUT (TREE_TYPE (decl)))
        load_class (name, 1);
     }
 }