Skip to content

Add support for out/ref Nullable parameters of proxied methods #1389

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

Merged
merged 9 commits into from
Oct 27, 2017
Merged

Add support for out/ref Nullable parameters of proxied methods #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
069b3f2
SaveRefArgument supports out/ref Nullable<T> parameters
Oct 18, 2017
4ab88b7
Merge branch 'master' into master
Oct 20, 2017
b615322
Add test with 'out Nullable<T>' argument
Oct 27, 2017
f60ed6e
Merge branch 'master' into master
Oct 27, 2017
eaea863
Add test for ref Nullable<int>
hazzik Oct 27, 2017
3a0082f
Reformat code
hazzik Oct 27, 2017
3c8e413
Oops
hazzik Oct 27, 2017
8d00866
Merge branch 'master' of github.com:nhibernate/nhibernate-core into p…
hazzik Oct 27, 2017
35a3feb
Corresponding changes to store ref Nullable<> arguments
hazzik Oct 27, 2017
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
17 changes: 17 additions & 0 deletions src/NHibernate.Test/DynamicProxyTests/ProxiedMembers/Fixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@ public virtual void Method2(ref int x)
{
x++;
}

public virtual void Method3(out int? y)
{
y = 4;
}

public virtual void Method4(ref int? y)
{
y++;
}
}

[TestFixture]
Expand All @@ -32,6 +42,13 @@ public void Proxy()
x = 4;
c.Method2(ref x);
Assert.AreEqual(5, x);

int? y;
c.Method3(out y);
Assert.AreEqual(4, y);

c.Method4(ref y);
Assert.AreEqual(5, y);
}
}
}
18 changes: 13 additions & 5 deletions src/NHibernate/Proxy/DynamicProxy/DefaultArgumentHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#endregion

using System;
using System.Reflection;
using System.Reflection.Emit;

Expand Down Expand Up @@ -55,12 +56,19 @@ public void PushArguments(ParameterInfo[] methodParameters, ILGenerator IL, bool

if (param.ParameterType.IsByRef)
{
OpCode ldindInstruction;
if(!OpCodesMap.TryGetLdindOpCode(param.ParameterType.GetElementType(), out ldindInstruction))
var unboxedType = param.ParameterType.GetElementType();
if (Nullable.GetUnderlyingType(unboxedType) != null)
{
ldindInstruction = OpCodes.Ldind_Ref;
IL.Emit(OpCodes.Ldobj, unboxedType);
}
else if (OpCodesMap.TryGetLdindOpCode(unboxedType, out var ldind))
{
IL.Emit(ldind);
}
else
{
IL.Emit(OpCodes.Ldind_Ref);
}
IL.Emit(ldindInstruction);
}

if (parameterType.IsValueType || param.ParameterType.IsByRef || parameterType.IsGenericParameter)
Expand All @@ -78,4 +86,4 @@ public void PushArguments(ParameterInfo[] methodParameters, ILGenerator IL, bool

#endregion
}
}
}
26 changes: 11 additions & 15 deletions src/NHibernate/Proxy/DynamicProxy/DefaultMethodEmitter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,23 +142,19 @@ private static void SaveRefArguments(ILGenerator IL, ParameterInfo[] parameters)

IL.Emit(OpCodes.Unbox_Any, unboxedType);

OpCode stind = GetStindInstruction(param.ParameterType);
IL.Emit(stind);
}
}

private static OpCode GetStindInstruction(System.Type parameterType)
{
if (parameterType.IsByRef)
{
OpCode stindOpCode;
if(OpCodesMap.TryGetStindOpCode(parameterType.GetElementType(), out stindOpCode))
if (Nullable.GetUnderlyingType(unboxedType) != null)
{
return stindOpCode;
IL.Emit(OpCodes.Stobj, unboxedType);
}
else if (OpCodesMap.TryGetStindOpCode(param.ParameterType.GetElementType(), out var stind))
{
IL.Emit(stind);
}
else
{
IL.Emit(OpCodes.Stind_Ref);
}
}

return OpCodes.Stind_Ref;
}

private static void PushTargetMethodInfo(ILGenerator IL, MethodBuilder generatedMethod, MethodInfo method)
Expand Down Expand Up @@ -247,4 +243,4 @@ private void PackageReturnType(MethodInfo method, ILGenerator IL)
IL.Emit(OpCodes.Unbox_Any, returnType);
}
}
}
}