jnimarshalmethod-gen.exe sometime generates duplicate marshal methods

[radekdoulik]

In case a class has interface method implementation with different return type, we generate duplicate marshal method.

An example:

[JniAddNativeMethodRegistration]
public static void __RegisterNativeMembers (JniNativeMethodRegistrationArguments args)
{
	args.AddRegistrations (new JniNativeMethodRegistration[35] {
...
		new JniNativeMethodRegistration ("n_append", "(Ljava/lang/CharSequence;)Ljava/nio/CharBuffer;", new Func<IntPtr, IntPtr, IntPtr, IntPtr> (__<$>_jni_marshal_methods.n_append_Ljava_lang_CharSequence_)),
...
		new JniNativeMethodRegistration ("n_append", "(Ljava/lang/CharSequence;)Ljava/lang/Appendable;", new Func<IntPtr, IntPtr, IntPtr, IntPtr> (__<$>_jni_marshal_methods.n_append_Ljava_lang_CharSequence_)),
	});
}

The return types are CharBuffer and IAppendable here. One derived from the other.

We should generate just one marshal method in this case, for the actual implementation method.

[radekdoulik]

The two marshal methods:

using Java.Interop;
using Java.Lang;
using System;
using System.Reflection;

public static IntPtr n_append_Ljava_lang_CharSequence_ (IntPtr __jnienv, IntPtr __this, IntPtr csq)
{
	JniTransition jniTransition = new JniTransition (__jnienv);
	JniRuntime runtime = default(JniRuntime);
	IAppendable appendable = default(IAppendable);
	Java.Interop.ProxyValueMarshaler proxyValueMarshaler2 = default(Java.Interop.ProxyValueMarshaler);
	JniValueMarshalerState jniValueMarshalerState = default(JniValueMarshalerState);
	try {
		runtime = JniEnvironment.Runtime;
		JniRuntime.JniValueManager valueManager = runtime.ValueManager;
		valueManager.WaitForGCBridgeProcessing ();
		CharBuffer value = valueManager.GetValue<CharBuffer> (__this);
		Java.Interop.ProxyValueMarshaler proxyValueMarshaler = new Java.Interop.ProxyValueMarshaler ();
		appendable = value.Java.Lang.IAppendable.Append ((ICharSequence)((JniValueMarshaler)proxyValueMarshaler).CreateValue (csq, typeof(ICharSequence)));
		proxyValueMarshaler2 = new Java.Interop.ProxyValueMarshaler ();
		jniValueMarshalerState = proxyValueMarshaler2.CreateArgumentState ((object)appendable, ParameterAttributes.None);
		IntPtr handle = jniValueMarshalerState.ReferenceValue.Handle;
		return JniEnvironment.References.NewReturnToJniRef (jniValueMarshalerState.ReferenceValue);
		IL_0089:;
	} catch (System.Exception ex) when (runtime.ExceptionShouldTransitionToJni (ex)) {
		jniTransition.SetPendingException (ex);
		return default(IntPtr);
		IL_00c7:;
	} finally {
		proxyValueMarshaler2.DestroyArgumentState ((object)appendable, ref jniValueMarshalerState, ParameterAttributes.None);
		jniTransition.Dispose ();
	}
	IntPtr intPtr = default(IntPtr);
	return intPtr;
}

and

using Java.Interop;
using Java.Lang;
using System;

public static IntPtr n_append_Ljava_lang_CharSequence_ (IntPtr __jnienv, IntPtr __this, IntPtr csq)
{
	JniTransition jniTransition = new JniTransition (__jnienv);
	JniRuntime runtime = default(JniRuntime);
	try {
		runtime = JniEnvironment.Runtime;
		JniRuntime.JniValueManager valueManager = runtime.ValueManager;
		valueManager.WaitForGCBridgeProcessing ();
		CharBuffer value = valueManager.GetValue<CharBuffer> (__this);
		Java.Interop.ProxyValueMarshaler proxyValueMarshaler = new Java.Interop.ProxyValueMarshaler ();
		CharBuffer charBuffer = value.Append ((ICharSequence)((JniValueMarshaler)proxyValueMarshaler).CreateValue (csq, typeof(ICharSequence)));
		JniObjectReference value2 = (charBuffer != null) ? charBuffer.PeerReference : default(JniObjectReference);
		return JniEnvironment.References.NewReturnToJniRef (value2);
		IL_007a:;
	} catch (System.Exception ex) when (runtime.ExceptionShouldTransitionToJni (ex)) {
		jniTransition.SetPendingException (ex);
		return default(IntPtr);
		IL_00b8:;
	} finally {
		jniTransition.Dispose ();
	}
	IntPtr intPtr = default(IntPtr);
	return intPtr;
}