Commit dd2c7ba8 authored by mgravell's avatar mgravell

fix bad merge

parent c325ad28
......@@ -3259,7 +3259,6 @@ private static void GenerateDeserializerFromMap(Type type, IDataReader reader, i
: names.Select(n => typeMap.GetMember(n))).ToList();
// stack is now [target]
bool first = true;
var allDone = il.DefineLabel();
var stringEnumLocal = (LocalBuilder)null;
......@@ -3369,6 +3368,7 @@ private static void GenerateDeserializerFromMap(Type type, IDataReader reader, i
il.EmitCall(OpCodes.Call, typeof(SqlMapper).GetMethod(nameof(SqlMapper.ThrowDataException)), null);
il.EndExceptionBlock();
il.Emit(OpCodes.Ldloc, returnValueLocal); // stack is [rval]
if (type.IsValueType)
{
il.Emit(OpCodes.Box, type);
......
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