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

	(type::merge): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@47077 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 6 insertions, 2 deletions

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;