FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

natVMProxy.cc (run_proxy): Use _Jv_LookupProxyMethod to find the Method.

Browse source 
2007-04-02  Andrew Haley  <aph@redhat.com>

        * java/lang/reflect/natVMProxy.cc (run_proxy): Use
        _Jv_LookupProxyMethod to find the Method.
        If parameter_types->length == 0, pass a null paramameter list,
        not a zero-length parameter list.
        * java/lang/natClass.cc (_Jv_LookupProxyMethod): New function.
        * java/lang/Class.h (_Jv_LookupProxyMethod): Declare.

From-SVN: r123431
This commit is contained in:
Andrew Haley 2007-04-02 16:36:52 +00:00 • committed by Andrew Haley
parent e6c45b1e34
commit a0036853d2
7 changed files with 67 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libjava/java/lang/reflect/Method.h
View file

@ -13,6 +13,7 @@
jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);
jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);
::java::lang::reflect::Method *_Jv_GetReflectedMethod (jclass, _Jv_Utf8Const*, _Jv_Utf8Const*);
::java::lang::reflect::Method *_Jv_LookupProxyMethod (jclass, _Jv_Utf8Const *, _Jv_Utf8Const *);
class java::lang::reflect::Method : public ::java::lang::reflect::AccessibleObject
{
@ -79,6 +80,7 @@ public:
friend class java::lang::Class;
friend class java::io::ObjectInputStream;
friend java::lang::reflect::Method* ::_Jv_GetReflectedMethod (jclass, _Jv_Utf8Const*, _Jv_Utf8Const*);
friend java::lang::reflect::Method* ::_Jv_LookupProxyMethod (jclass, _Jv_Utf8Const *, _Jv_Utf8Const *);
};
#endif // __java_lang_reflect_Method__

21
libjava/java/lang/reflect/natVMProxy.cc
View file

@ -301,6 +301,8 @@ run_proxy (ffi_cif *cif,
void **args,
void*user_data)
{
using namespace java::lang::reflect;
Proxy *proxy = *(Proxy**)args[0];
ncode_closure *self = (ncode_closure *) user_data;
@ -312,17 +314,22 @@ run_proxy (ffi_cif *cif,
Thread *thread = Thread::currentThread();
_Jv_InterpFrame frame_desc (self->self, thread, proxy->getClass());
Method *meth = _Jv_GetReflectedMethod (proxy->getClass(),
self->self->name,
self->self->signature);
Method *meth = _Jv_LookupProxyMethod (proxy->getClass(),
self->self->name,
self->self->signature);
JArray<jclass> *parameter_types = meth->internalGetParameterTypes ();
JArray<jclass> *exception_types = meth->internalGetExceptionTypes ();
InvocationHandler *handler = proxy->h;
void *poo
= _Jv_NewObjectArray (parameter_types->length, &Object::class$, NULL);
JArray<jobject> *argsArray = (JArray<jobject> *) poo;
jobject *jargs = elements(argsArray);
JArray<jobject> *argsArray = NULL;
jobject *jargs = NULL;
if (parameter_types->length)
{
void *poo
= _Jv_NewObjectArray (parameter_types->length, &Object::class$, NULL);
argsArray = (JArray<jobject> *) poo;
jargs = elements(argsArray);
}
// FIXME: It must be possible to use fast interface dispatch here,
// but I've not quite figured out how to do it.