class.c (finish_class): Whenever a deferred method is output...

1999-06-24  Andrew Haley  <aph@cygnus.com>
	* java/class.c (finish_class): Whenever a deferred method is
	output, rescan the list of methods to see if a new candidate for
	output can be found.

From-SVN: r27725

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 0bea56743353a660517ab553322a801ea655d10a..262dc4841091ab482a7c7203df83287be8edb2ea 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+1999-06-24  Andrew Haley  <aph@cygnus.com>
+
+       * class.c (finish_class): Whenever a deferred method is
+       output, rescan the list of methods to see if a new candidate for
+       output can be found.
+
 1999-06-22  Andrew Haley  <aph@cygnus.com>
 
        * verify.c (verify_jvm_instructions): Check for pending blocks

diff --git a/gcc/java/class.c b/gcc/java/class.c
index 8217a9507687afb9d1a2d292014a14d87c662dfa..9c06d44903ad97018091b87f4a646433cfe47386 100644 (file)
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -1200,10 +1200,10 @@ finish_class (cl)
      tree cl;
 {
   tree method;
+  tree type_methods = TYPE_METHODS (CLASS_TO_HANDLE_TYPE (current_class));
 
-  /* Emit deferred inline methods. */
-  for ( method = TYPE_METHODS (CLASS_TO_HANDLE_TYPE (current_class));
-       method != NULL_TREE; method = TREE_CHAIN (method))
+  /* Emit deferred inline methods. */  
+  for (method = type_methods; method != NULL_TREE; )
     {
       if (! TREE_ASM_WRITTEN (method) && DECL_SAVED_INSNS (method) != 0)
        {
@@ -1215,8 +1215,13 @@ finish_class (cl)
              temporary_allocation ();
              output_inline_function (method);
              permanent_allocation (1);
+             /* Scan the list again to see if there are any earlier
+                 methods to emit. */
+             method = type_methods;
+             continue;
            }
        }
+      method = TREE_CHAIN (method);
     }
 
   make_class_data (current_class);