(state == JV_STATE_IN_PROGRESS).
(_Jv_GetInterfaces): Use _Jv_WaitForState to link interface.
* java/lang/natClassLoader.cc (_Jv_WaitForState): Handle
interpreted classes.
(linkClass0): Use _Jv_WaitForState.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62161
138bc75d-0d04-0410-961f-
82ee72b054a4
+2003-01-30 Jeff Sturm <jsturm@one-point.com>
+
+ * java/lang/natClass.cc (initializeClass): Check tables when
+ (state == JV_STATE_IN_PROGRESS).
+ (_Jv_GetInterfaces): Use _Jv_WaitForState to link interface.
+ * java/lang/natClassLoader.cc (_Jv_WaitForState): Handle
+ interpreted classes.
+ (linkClass0): Use _Jv_WaitForState.
+
2003-01-28 Oscar Pearce <oscar@pearceenterprises.com>
* java/awt/Component.java (processPaintEvent): Dispose of Graphics
wait ();
// Steps 3 & 4.
- if (state == JV_STATE_DONE || state == JV_STATE_IN_PROGRESS)
+ if (state == JV_STATE_DONE)
{
_Jv_MonitorExit (this);
return;
}
+ if (state == JV_STATE_IN_PROGRESS)
+ {
+ _Jv_MonitorExit (this);
+
+ /* Initialization in progress. The class is linked now,
+ so ensure internal tables are built. */
+ _Jv_PrepareConstantTimeTables (this);
+ _Jv_MakeVTable(this);
+ _Jv_LinkOffsetTable(this);
+
+ return;
+ }
// Step 5.
if (state == JV_STATE_ERROR)
for (int i=0; i < klass->interface_count; i++)
{
jclass iface = klass->interfaces[i];
+
+ /* Make sure interface is linked. */
+ _Jv_WaitForState(iface, JV_STATE_LINKED);
+
if (_Jv_IndexOf (iface, (void **) ifaces->list, ifaces->count) == -1)
{
if (ifaces->count + 1 >= ifaces->len)
{
// Must call _Jv_PrepareCompiledClass while holding the class
// mutex.
+#ifdef INTERPRETER
+ if (_Jv_IsInterpretedClass (klass))
+ _Jv_PrepareClass (klass);
+#endif
_Jv_PrepareCompiledClass (klass);
_Jv_MonitorExit (klass);
return;
void
java::lang::ClassLoader::linkClass0 (java::lang::Class *klass)
{
- if (klass->state >= JV_STATE_LINKED)
- return;
-
-#ifdef INTERPRETER
- if (_Jv_IsInterpretedClass (klass))
- _Jv_PrepareClass (klass);
-#endif
-
- _Jv_PrepareCompiledClass (klass);
+ _Jv_WaitForState (klass, JV_STATE_LINKED);
}
void