diff options
| author | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-10-13 17:36:07 +0000 |
|---|---|---|
| committer | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-10-13 17:36:07 +0000 |
| commit | 9a602a0383f15b04220fc529d4a66f8f9f111281 (patch) | |
| tree | ed6a5f713bffb23dc047a7b7d17b3af36a5ad222 /libjava | |
| parent | fef3501c2cb38ef8a5318456856c4a32b77b7c4c (diff) | |
| download | gcc-9a602a0383f15b04220fc529d4a66f8f9f111281.tar.gz | |
2005-10-12 Andrew Haley <aph@redhat.com>
PR java/24251
* link.cc (ensure_method_table_complete): Install Miranda methods
for interfaces too.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@105375 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/link.cc | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8098216c1a4..f8f55a0d197 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-10-12 Andrew Haley <aph@redhat.com> + + PR java/24251 + * link.cc (ensure_method_table_complete): Install Miranda methods + for interfaces too. + 2005-10-10 Tom Tromey <tromey@redhat.com> * testsuite/libjava.lang/ExtraClassLoader.out: New file. diff --git a/libjava/link.cc b/libjava/link.cc index 7e51a2670e3..2d6b1990648 100644 --- a/libjava/link.cc +++ b/libjava/link.cc @@ -1548,11 +1548,12 @@ _Jv_Linker::add_miranda_methods (jclass base, jclass iface_class) void _Jv_Linker::ensure_method_table_complete (jclass klass) { - if (klass->vtable != NULL || klass->isInterface()) + if (klass->vtable != NULL) return; // We need our superclass to have its own Miranda methods installed. - wait_for_state (klass->getSuperclass (), JV_STATE_LOADED); + if (! klass->isInterface()) + wait_for_state (klass->getSuperclass (), JV_STATE_LOADED); // A class might have so-called "Miranda methods". This is a method // that is declared in an interface and not re-declared in an |