Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(mono-rt2): allow default parameters for dynfunc #2918

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(mono-rt2): allow default parameters for dynfunc #2918

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 43 additions & 19 deletions code/client/clrcore-v2/DynFunc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ private static DynFunc Construct(object target, MethodInfo method)
return (DynFunc)existingMethod.CreateDelegate(typeof(DynFunc), target);
}

// TODO: implement optional parameter(s) support with parameter.IsOptional and parameter.DefaultValue

ParameterInfo[] parameters = method.GetParameters();
#if DYN_FUNC_CALLI
Type[] parameterTypes = new Type[parameters.Length];
Expand All @@ -126,6 +124,7 @@ private static DynFunc Construct(object target, MethodInfo method)
hasThis ? new[] { typeof(object), typeof(Remote), typeof(object[]) } : new[] { typeof(Remote), typeof(object[]) });

ILGenerator g = lambda.GetILGenerator();
g.DeclareLocal(typeof(uint));

OpCode ldarg_remote, ldarg_args;
if (hasThis)
Expand All @@ -141,8 +140,13 @@ private static DynFunc Construct(object target, MethodInfo method)
ldarg_args = OpCodes.Ldarg_1;
}

g.Emit(ldarg_args);
g.Emit(OpCodes.Ldlen);
g.Emit(OpCodes.Stloc_0);
for (int i = 0, p = 0; i < parameters.Length; ++i)
{
Label lblOutOfRange = g.DefineLabel();
Label lblNextArgument = g.DefineLabel();
var parameter = parameters[i];
var t = parameter.ParameterType;

Expand Down Expand Up @@ -176,27 +180,15 @@ private static DynFunc Construct(object target, MethodInfo method)
throw new ArgumentException($"{nameof(SourceAttribute)} used on type {t}, this type can't be constructed with parameter Remote.");
}

g.Emit(OpCodes.Ldc_I4, p);
g.Emit(OpCodes.Ldloc_0);
g.Emit(OpCodes.Bge_Un, lblOutOfRange);
g.Emit(ldarg_args);
g.Emit(OpCodes.Ldc_I4_S, (byte)p++);
g.Emit(OpCodes.Ldelem_Ref);

if (t.IsValueType)
{
Label diff = g.DefineLabel();
Label done = g.DefineLabel();

g.Emit(OpCodes.Dup);

// check if given type is already of the target type
g.Emit(OpCodes.Isinst, t);
g.Emit(OpCodes.Brfalse_S, diff);

// same type, unbox and pass it as an argument
g.Emit(OpCodes.Unbox_Any, t);
g.Emit(OpCodes.Br, done);

// not the same type, try and convert it
g.MarkLabel(diff);
if (t.IsPrimitive)
{
g.Emit(OpCodes.Call, convertMethods[t]); // already handles null
Expand All @@ -206,14 +198,46 @@ private static DynFunc Construct(object target, MethodInfo method)
g.Emit(OpCodes.Pop);
g.Emit(OpCodes.Ldloc_S, g.DeclareLocal(t));
}

g.MarkLabel(done);
}
else if (t != typeof(object))
{
g.Emit(OpCodes.Castclass, t); // throwing cast, exception on fail
//g.Emit(OpCodes.Isinst, t); // non throwing cast, null on fail
}
g.Emit(OpCodes.Br, lblNextArgument);

g.MarkLabel(lblOutOfRange);
if (parameter.IsOptional)
{
switch (parameter.DefaultValue)
{
case null: g.Emit(OpCodes.Ldnull); break;
case string v: g.Emit(OpCodes.Ldstr, v); break;
case byte v: g.Emit(OpCodes.Ldc_I4, v); break;
case ushort v: g.Emit(OpCodes.Ldc_I4, v); break;
case uint v: g.Emit(OpCodes.Ldc_I4, v); break;
case ulong v: g.Emit(OpCodes.Ldc_I4, v); break;
case sbyte v: g.Emit(OpCodes.Ldc_I4, v); break;
case short v: g.Emit(OpCodes.Ldc_I4, v); break;
case int v: g.Emit(OpCodes.Ldc_I4, v); break;
}

// Generic way to also support Nullable<> types
if (t.IsGenericType)
{
Type[] genericArguments = t.GetGenericArguments();
if (genericArguments.Length == 1)
g.Emit(OpCodes.Newobj, t.GetConstructor(genericArguments));
else
throw new ArgumentException($"Default value for {t} is unsupported.");
}
}
else
{
g.Emit(OpCodes.Newobj, typeof(IndexOutOfRangeException).GetConstructor(Type.EmptyTypes));
g.Emit(OpCodes.Throw);
}
g.MarkLabel(lblNextArgument);
}

#if DYN_FUNC_CALLI
Expand Down
Loading