Skip to content

D
Dapper
Commit c7dd5f0d authored by vosen's avatar vosen
Browse files
Options

Fix broken IL when generating default value-typed values.

parent 7fe87dc6
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
Dapper/SqlMapper.cs
View file @ c7dd5f0d
...@@ -1665,10 +1665,17 @@ static List<FieldInfo> GetSettableFields(Type t) ...@@ -1665,10 +1665,17 @@ static List<FieldInfo> GetSettableFields(Type t)
{ {
Type itemType = item.Property != null ? item.Property.Type : item.Field.FieldType; Type itemType = item.Property != null ? item.Property.Type : item.Field.FieldType;
if (itemType.IsValueType) if (itemType.IsValueType)
{
il.DeclareLocal(itemType);
il.Emit(OpCodes.Ldloca_S, (byte)(index + 2));
il.Emit(OpCodes.Initobj, itemType); il.Emit(OpCodes.Initobj, itemType);
il.Emit(OpCodes.Ldloc, (short)(index + 2));
}
else else
{
il.Emit(OpCodes.Ldnull); il.Emit(OpCodes.Ldnull);
} }
}
else else
{ {
il.Emit(OpCodes.Pop); // stack is now [target][target] il.Emit(OpCodes.Pop); // stack is now [target][target]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment