Print -verbose:message on "loading", not initialization.

	* java/lang/Class.h (JV_STATE_LOADED, JV_STATE_COMPILED):  Swap order.
	* defineclass.cc (_Jv_ClassReader::parse):  Print message if
	gcj::verbose_class_flag.
	* java/lang/natClass.cc (initializeClass):  Don't print message here.
	* java/lang/natClassLoader.cc (_Jv_WaitForState):  If state was
	_JV_STATE_COMPILED, set to JV_STATE_LOADED and may print message.
	(_Jv_PrepareCompiledClass):  Likewise.


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

3 files changed, 14 insertions, 7 deletions

diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h
index e93920c06b5..de00c2eb2fb 100644
--- a/libjava/java/lang/Class.h
+++ b/libjava/java/lang/Class.h
@@ -39,10 +39,9 @@ enum
 
   JV_STATE_PRELOADING = 1,	// Can do _Jv_FindClass.
   JV_STATE_LOADING = 3,		// Has super installed.
-  JV_STATE_LOADED = 5,		// Is complete.
-    
-  JV_STATE_COMPILED = 6,	// This was a compiled class.
+  JV_STATE_COMPILED = 5,	// This was a compiled class.
 
+  JV_STATE_LOADED = 6,		// Is complete.
   JV_STATE_PREPARED = 7,	// Layout & static init done.
   JV_STATE_LINKED = 9,		// Strings interned.
 
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index 943269eb52e..1b1a32d1bab 100644
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -831,9 +831,6 @@ java::lang::Class::initializeClass (void)
       throw except;
     }
 
-  if (gcj::verbose_class_flag)
-    fprintf (stderr, "[Loaded %s]\n", (const char*)(name->data));
-
   _Jv_MonitorEnter (this);
   state = JV_STATE_DONE;
   notifyAll ();
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index ec48352c792..b38c2db1625 100644
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -48,6 +48,12 @@ _Jv_WaitForState (jclass klass, int state)
   
   _Jv_MonitorEnter (klass) ;
 
+  if (klass->state == JV_STATE_COMPILED)
+    {
+      klass->state = JV_STATE_LOADED;
+      if (gcj::verbose_class_flag)
+	fprintf (stderr, "[Loaded (pre-compiled) %s]\n", (const char*)(klass->name->data));
+    }
   if (state == JV_STATE_LINKED)
     {
       // Must call _Jv_PrepareCompiledClass while holding the class
@@ -86,7 +92,8 @@ typedef unsigned int uaddr __attribute__ ((mode (pointer)));
 void
 _Jv_PrepareCompiledClass (jclass klass)
 {
-  if (klass->state >= JV_STATE_LINKED)
+  jint state = klass->state;
+  if (state >= JV_STATE_LINKED)
     return;
 
   // Short-circuit, so that mutually dependent classes are ok.
@@ -173,6 +180,10 @@ _Jv_PrepareCompiledClass (jclass klass)
   if (klass->isInterface ())
     _Jv_LayoutInterfaceMethods (klass);
 
+  if (state == JV_STATE_COMPILED && gcj::verbose_class_flag)
+    fprintf (stderr, "[Loaded (pre-compiled) %s]\n",
+	     (const char*)(klass->name->data));
+
   klass->notifyAll ();
 
   _Jv_PushClass (klass);