From f50e7a2d92218d935970483c33c61c8566840f6b Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Nov 2001 01:28:55 +0000
Subject: verify.cc (type::compatible): Use _Jv_IsAssignableFrom.

	* verify.cc (type::compatible): Use _Jv_IsAssignableFrom.
	(type::merge): Likewise.

From-SVN: r47077
---
 libjava/verify.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'libjava/verify.cc')

diff --git a/libjava/verify.cc b/libjava/verify.cc
index 6deb80b..2691ed3 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;
-- 
cgit v1.1