diff options
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/interpret.cc | 10 | ||||
| -rw-r--r-- | libjava/verify.cc | 11 |
3 files changed, 20 insertions, 8 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c2b65f4306f..df1c794e3ac 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2002-11-25 Tom Tromey <tromey@redhat.com> + + * verify.cc (type::compatible): Check initialization status + first. + * interpret.cc (run) [insn_invokespecial, invokespecial_resolved]: + Don't use NULLCHECK. + 2002-11-23 Mark Wielaard <mark@klomp.org> * javax/naming/AuthenticationException.java: Update copyright header. diff --git a/libjava/interpret.cc b/libjava/interpret.cc index d3f919bac13..bc324b13ba9 100644 --- a/libjava/interpret.cc +++ b/libjava/interpret.cc @@ -2795,7 +2795,10 @@ _Jv_InterpMethod::run (void *retp, ffi_raw *args) sp -= rmeth->stack_item_count; - NULLCHECK (sp[0].o); + // We don't use NULLCHECK here because we can't rely on that + // working for <init>. So instead we do an explicit test. + if (! sp[0].o) + throw new java::lang::NullPointerException; fun = (void (*)()) rmeth->method->ncode; @@ -2813,7 +2816,10 @@ _Jv_InterpMethod::run (void *retp, ffi_raw *args) { rmeth = (_Jv_ResolvedMethod *) AVAL (); sp -= rmeth->stack_item_count; - NULLCHECK (sp[0].o); + // We don't use NULLCHECK here because we can't rely on that + // working for <init>. So instead we do an explicit test. + if (! sp[0].o) + throw new java::lang::NullPointerException; fun = (void (*)()) rmeth->method->ncode; } goto perform_invoke; diff --git a/libjava/verify.cc b/libjava/verify.cc index 29f0f321a7f..5917ce09c77 100644 --- a/libjava/verify.cc +++ b/libjava/verify.cc @@ -458,8 +458,12 @@ private: if (key < reference_type || k.key < reference_type) return key == k.key; + // An initialized type and an uninitialized type are not + // compatible. + if (isinitialized () != k.isinitialized ()) + return false; + // The `null' type is convertible to any reference type. - // FIXME: is this correct for THIS? if (key == null_type || k.key == null_type) return true; @@ -469,11 +473,6 @@ private: && data.klass == &java::lang::Object::class$) return true; - // An initialized type and an uninitialized type are not - // compatible. - if (isinitialized () != k.isinitialized ()) - return false; - // Two uninitialized objects are compatible if either: // * The PCs are identical, or // * One PC is UNINIT. |