Skip to content
Snippets Groups Projects
Commit eaa7d1b5 authored by bryce's avatar bryce
Browse files

2000-03-21 Bryce McKinlay <bryce@albatross.co.nz>

        * java/lang/natClass.cc (isInstance): Initialize `this'.
        (isAssignableFrom): Initialize `this' and `klass'.
        (_Jv_IsAssignableFrom): If an interface has no idt, it is not
        implemented by any loaded class, so return false.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32663 138bc75d-0d04-0410-961f-82ee72b054a4
parent eee76bb1
No related merge requests found
2000-03-21 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/natClass.cc (isInstance): Initialize `this'.
(isAssignableFrom): Initialize `this' and `klass'.
(_Jv_IsAssignableFrom): If an interface has no idt, it is not
implemented by any loaded class, so return false.
2000-03-19 Warren Levy <warrenl@cygnus.com>
* java/awt/Color.java: Specified java.io for Serializable.
......
......@@ -613,6 +613,9 @@ java::lang::Class::getMethods (void)
jboolean
java::lang::Class::isAssignableFrom (jclass klass)
{
// Arguments may not have been initialized, given ".class" syntax.
_Jv_InitClass (this);
_Jv_InitClass (klass);
return _Jv_IsAssignableFrom (this, klass);
}
......@@ -621,6 +624,7 @@ java::lang::Class::isInstance (jobject obj)
{
if (! obj || isPrimitive ())
return false;
_Jv_InitClass (this);
return isAssignableFrom (obj->getClass());
}
......@@ -919,6 +923,8 @@ _Jv_IsAssignableFrom (jclass target, jclass source)
{
_Jv_IDispatchTable *cl_idt = source->idt;
_Jv_IDispatchTable *if_idt = target->idt;
if (if_idt == NULL)
return false; // No class implementing TARGET has been loaded.
jshort cl_iindex = cl_idt->cls.iindex;
if (cl_iindex <= if_idt->iface.ioffsets[0])
{
......@@ -927,7 +933,6 @@ _Jv_IsAssignableFrom (jclass target, jclass source)
&& cl_idt->cls.itable[offset] == target)
return true;
}
return false;
}
return false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment