From cbad89c4e2c9f6fdb510bf9f2878ffcd31c91e2f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 26 Nov 2002 07:15:53 +0000 Subject: [PATCH] * verify.cc (type::compatible): Backed out broken change. From-SVN: r59496 --- libjava/ChangeLog | 2 ++ libjava/verify.cc | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index df1c794e3ac1..be1730430e76 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,7 @@ 2002-11-25 Tom Tromey + * verify.cc (type::compatible): Backed out broken change. + * verify.cc (type::compatible): Check initialization status first. * interpret.cc (run) [insn_invokespecial, invokespecial_resolved]: diff --git a/libjava/verify.cc b/libjava/verify.cc index 5917ce09c770..001543fc7dce 100644 --- a/libjava/verify.cc +++ b/libjava/verify.cc @@ -458,11 +458,6 @@ 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. if (key == null_type || k.key == null_type) return true; @@ -473,6 +468,11 @@ 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.