diff options
| author | Bryce McKinlay <mckinlay@redhat.com> | 2004-05-21 16:08:50 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2004-05-21 17:08:50 +0100 |
| commit | 17abdabcf3d4261dbebcc88cfaa1810b20811fe9 (patch) | |
| tree | d4b682050387bf0dfb79db0204b069788d5ba771 /libjava | |
| parent | e54d02140051c9fe0ccddf982aa1d7b29d7c3263 (diff) | |
| download | gcc-17abdabcf3d4261dbebcc88cfaa1810b20811fe9.zip gcc-17abdabcf3d4261dbebcc88cfaa1810b20811fe9.tar.gz gcc-17abdabcf3d4261dbebcc88cfaa1810b20811fe9.tar.bz2 | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/java/lang/natClass.cc | 3 | ||||
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8299f0d..a613fb7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +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> * Makefile.am (awt_java_source_files): Remove javax.rmi and @@ -27,7 +34,6 @@ * java/io/Writer.java (Writer(Object)): Check for null lock object. - 2004-05-15 Mark Wielaard <mark@klomp.org> * doc/cni.sgml: Removed, merged into gcj.texi. diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index 3ceda11..ead9bce 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -790,9 +790,6 @@ java::lang::Class::initializeClass (void) } } - if (isInterface ()) - _Jv_LayoutInterfaceMethods (this); - _Jv_PrepareConstantTimeTables (this); if (vtable == NULL) diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index 9921d1d..ec48352 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -170,6 +170,9 @@ _Jv_PrepareCompiledClass (jclass klass) } #endif /* INTERPRETER */ + if (klass->isInterface ()) + _Jv_LayoutInterfaceMethods (klass); + klass->notifyAll (); _Jv_PushClass (klass); |