From f50e7a2d92218d935970483c33c61c8566840f6b Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 16 Nov 2001 01:28:55 +0000 Subject: [PATCH] verify.cc (type::compatible): Use _Jv_IsAssignableFrom. * verify.cc (type::compatible): Use _Jv_IsAssignableFrom. (type::merge): Likewise. From-SVN: r47077 --- libjava/ChangeLog | 5 +++++ libjava/verify.cc | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c62f85006a4..d6c3dac9a73 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2001-11-15 Tom Tromey + + * verify.cc (type::compatible): Use _Jv_IsAssignableFrom. + (type::merge): Likewise. + 2001-11-14 Hans Boehm * java/lang/natString.cc: correct argument order for diff --git a/libjava/verify.cc b/libjava/verify.cc index 6deb80b08d6..2691ed378e7 100644 --- a/libjava/verify.cc +++ b/libjava/verify.cc @@ -373,7 +373,9 @@ private: // We must resolve both types and check assignability. resolve (); k.resolve (); - return data.klass->isAssignableFrom (k.data.klass); + // Use _Jv_IsAssignableFrom to avoid premature class + // initialization. + return _Jv_IsAssignableFrom (data.klass, k.data.klass); } bool isvoid () const @@ -537,7 +539,9 @@ private: // This loop will end when we hit Object. while (true) { - if (k->isAssignableFrom (oldk)) + // Use _Jv_IsAssignableFrom to avoid premature + // class initialization. + if (_Jv_IsAssignableFrom (k, oldk)) break; k = k->getSuperclass (); changed = true;