procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libgcj/23739 (JNI: IsAssignableFrom reverses arguments)

Browse source 
PR libgcj/23739:
	* testsuite/libjava.jni/pr23739.c: New file.
	* testsuite/libjava.jni/pr23739.java: New file.
	* testsuite/libjava.jni/pr23739.out: New file.
	* jni.cc (_Jv_JNI_IsAssignableFrom): Reversed arguments.
	* java/lang/reflect/natMethod.cc (invoke): Updated.
	* java/lang/natClass.cc (isAssignableFrom): Updated.
	(isInstance): Likewise.
	(_Jv_IsAssignableFrom): Reversed arguments.
	(_Jv_IsInstanceOf): Updated.
	(_Jv_CheckCast): Likewise.
	(_Jv_CheckArrayStore): Likewise.
	(_Jv_IsAssignableFromSlow): Reversed arguments.
	(_Jv_InterfaceAssignableFrom): Likewise.
	* link.cc (verify_type_assertions): Updated.
	* prims.cc (_Jv_CheckAccess): Updated.

From-SVN: r103953
This commit is contained in:
Tom Tromey 2005-09-06 16:01:31 +00:00 • committed by Tom Tromey
parent 3e248b8315
commit 852993e381
10 changed files with 73 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libjava/java/lang/natClass.cc
View file

@ -623,7 +623,7 @@ 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);
return _Jv_IsAssignableFrom (klass, this);
}
jboolean
@ -632,7 +632,7 @@ java::lang::Class::isInstance (jobject obj)
if (! obj)
return false;
_Jv_InitClass (this);
return _Jv_IsAssignableFrom (this, JV_CLASS (obj));
return _Jv_IsAssignableFrom (JV_CLASS (obj), this);
}
jobject
@ -964,7 +964,7 @@ _Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, int method_idx)
}
jboolean
_Jv_IsAssignableFrom (jclass target, jclass source)
_Jv_IsAssignableFrom (jclass source, jclass target)
{
if (source == target)
return true;
@ -984,7 +984,7 @@ _Jv_IsAssignableFrom (jclass target, jclass source)
// two interfaces for assignability.
if (__builtin_expect
(source->idt == NULL || source->isInterface(), false))
return _Jv_InterfaceAssignableFrom (target, source);
return _Jv_InterfaceAssignableFrom (source, target);
_Jv_IDispatchTable *cl_idt = source->idt;
_Jv_IDispatchTable *if_idt = target->idt;
@ -1033,19 +1033,19 @@ _Jv_IsAssignableFrom (jclass target, jclass source)
// superinterface of SOURCE. This is used when SOURCE is also an interface,
// or a class with no interface dispatch table.
jboolean
_Jv_InterfaceAssignableFrom (jclass iface, jclass source)
_Jv_InterfaceAssignableFrom (jclass source, jclass iface)
{
for (int i = 0; i < source->interface_count; i++)
{
jclass interface = source->interfaces[i];
if (iface == interface
|| _Jv_InterfaceAssignableFrom (iface, interface))
|| _Jv_InterfaceAssignableFrom (interface, iface))
return true;
}
if (!source->isInterface()
&& source->superclass
&& _Jv_InterfaceAssignableFrom (iface, source->superclass))
&& _Jv_InterfaceAssignableFrom (source->superclass, iface))
return true;
return false;
@ -1056,14 +1056,14 @@ _Jv_IsInstanceOf(jobject obj, jclass cl)
{
if (__builtin_expect (!obj, false))
return false;
return (_Jv_IsAssignableFrom (cl, JV_CLASS (obj)));
return _Jv_IsAssignableFrom (JV_CLASS (obj), cl);
}
void *
_Jv_CheckCast (jclass c, jobject obj)
{
if (__builtin_expect
(obj != NULL && ! _Jv_IsAssignableFrom(c, JV_CLASS (obj)), false))
(obj != NULL && ! _Jv_IsAssignableFrom(JV_CLASS (obj), c), false))
throw new java::lang::ClassCastException
((new java::lang::StringBuffer
(obj->getClass()->getName()))->append
@ -1084,7 +1084,7 @@ _Jv_CheckArrayStore (jobject arr, jobject obj)
return;
jclass obj_class = JV_CLASS (obj);
if (__builtin_expect
(! _Jv_IsAssignableFrom (elt_class, obj_class), false))
(! _Jv_IsAssignableFrom (obj_class, elt_class), false))
throw new java::lang::ArrayStoreException
((new java::lang::StringBuffer
(JvNewStringUTF("Cannot store ")))->append
@ -1095,7 +1095,7 @@ _Jv_CheckArrayStore (jobject arr, jobject obj)
}
jboolean
_Jv_IsAssignableFromSlow (jclass target, jclass source)
_Jv_IsAssignableFromSlow (jclass source, jclass target)
{
// First, strip arrays.
while (target->isArray ())
@ -1129,7 +1129,7 @@ _Jv_IsAssignableFromSlow (jclass target, jclass source)
{
// We use a recursive call because we also need to
// check superinterfaces.
if (_Jv_IsAssignableFromSlow (target, source->getInterface (i)))
if (_Jv_IsAssignableFromSlow (source->getInterface (i), target))
return true;
}
}