OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

From-SVN: r47077
This commit is contained in:
Tom Tromey 2001-11-16 01:28:55 +00:00 committed by Tom Tromey
parent 9f1a9740d4
commit f50e7a2d92
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2001-11-15 Tom Tromey <tromey@redhat.com>
* verify.cc (type::compatible): Use _Jv_IsAssignableFrom.
(type::merge): Likewise.
2001-11-14 Hans Boehm <Hans_Boehm@hp.com> 2001-11-14 Hans Boehm <Hans_Boehm@hp.com>
* java/lang/natString.cc: correct argument order for * java/lang/natString.cc: correct argument order for

8
libjava/verify.cc
View File

@ -373,7 +373,9 @@ private:
// We must resolve both types and check assignability. // We must resolve both types and check assignability.
resolve (); resolve ();
k.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 bool isvoid () const
@ -537,7 +539,9 @@ private:
// This loop will end when we hit Object. // This loop will end when we hit Object.
while (true) while (true)
{ {
if (k->isAssignableFrom (oldk)) // Use _Jv_IsAssignableFrom to avoid premature
// class initialization.
if (_Jv_IsAssignableFrom (k, oldk))
break; break;
k = k->getSuperclass (); k = k->getSuperclass ();
changed = true; changed = true;