[Ikvm-commit] ikvm/runtime ByteCodeHelper.cs,1.98,1.99
Brought to you by:
jfrijters
|
From: Jeroen F. <jfr...@us...> - 2015-03-13 16:00:05
|
Update of /cvsroot/ikvm/ikvm/runtime In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28927 Modified Files: ByteCodeHelper.cs Log Message: Bug fix. Late bound delegate signature conversion should use explicitCastArguments instead of asType to handle varargs correctly. Index: ByteCodeHelper.cs =================================================================== RCS file: /cvsroot/ikvm/ikvm/runtime/ByteCodeHelper.cs,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** ByteCodeHelper.cs 12 Mar 2015 14:46:14 -0000 1.98 --- ByteCodeHelper.cs 13 Mar 2015 16:00:03 -0000 1.99 *************** *** 392,396 **** { java.lang.invoke.MethodHandle mh = DynamicLoadMethodHandleImpl(kind, clazz, name, sig, callerID); ! return GetDelegateForInvokeExact<T>(mh.asType(MethodHandleUtil.GetDelegateMethodType(typeof(T)))); } catch (java.lang.IncompatibleClassChangeError x) --- 392,396 ---- { java.lang.invoke.MethodHandle mh = DynamicLoadMethodHandleImpl(kind, clazz, name, sig, callerID); ! return GetDelegateForInvokeExact<T>(java.lang.invoke.MethodHandles.explicitCastArguments(mh, MethodHandleUtil.GetDelegateMethodType(typeof(T)))); } catch (java.lang.IncompatibleClassChangeError x) |