Commit 17abdabc by Bryce McKinlay Committed by Bryce McKinlay

Layout interfaces during preparation, not initialization.

	* java/lang/natClass.cc (initializeClass): Move
	_Jv_LayoutInterfaceMethods call...
	* java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass): to here.

From-SVN: r82101
parent e54d0214
2004-05-21 Bryce McKinlay <mckinlay@redhat.com>
Layout interfaces during preparation, not initialization.
* java/lang/natClass.cc (initializeClass): Move
_Jv_LayoutInterfaceMethods call...
* java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass): to here.
2004-05-19 Anthony Green <green@localhost.localdomain> 2004-05-19 Anthony Green <green@localhost.localdomain>
* Makefile.am (awt_java_source_files): Remove javax.rmi and * Makefile.am (awt_java_source_files): Remove javax.rmi and
...@@ -27,7 +34,6 @@ ...@@ -27,7 +34,6 @@
* java/io/Writer.java (Writer(Object)): Check for null lock object. * java/io/Writer.java (Writer(Object)): Check for null lock object.
2004-05-15 Mark Wielaard <mark@klomp.org> 2004-05-15 Mark Wielaard <mark@klomp.org>
* doc/cni.sgml: Removed, merged into gcj.texi. * doc/cni.sgml: Removed, merged into gcj.texi.
......
...@@ -790,9 +790,6 @@ java::lang::Class::initializeClass (void) ...@@ -790,9 +790,6 @@ java::lang::Class::initializeClass (void)
} }
} }
if (isInterface ())
_Jv_LayoutInterfaceMethods (this);
_Jv_PrepareConstantTimeTables (this); _Jv_PrepareConstantTimeTables (this);
if (vtable == NULL) if (vtable == NULL)
......
...@@ -170,6 +170,9 @@ _Jv_PrepareCompiledClass (jclass klass) ...@@ -170,6 +170,9 @@ _Jv_PrepareCompiledClass (jclass klass)
} }
#endif /* INTERPRETER */ #endif /* INTERPRETER */
if (klass->isInterface ())
_Jv_LayoutInterfaceMethods (klass);
klass->notifyAll (); klass->notifyAll ();
_Jv_PushClass (klass); _Jv_PushClass (klass);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment