This commit is contained in:
James Newton-King
2016-09-13 16:51:39 +12:00
parent 867f4a7d43
commit a0403492ad
4 changed files with 65 additions and 8 deletions
@@ -92,7 +92,6 @@ namespace Newtonsoft.Json.Utilities
LocalBuilder localConvertible = generator.DeclareLocal(typeof(IConvertible));
LocalBuilder localObject = generator.DeclareLocal(typeof(object));
int localVariableCount = 2;
for (int i = 0; i < args.Length; i++)
{
@@ -140,11 +139,9 @@ namespace Newtonsoft.Json.Utilities
}
generator.Emit(OpCodes.Ldloca_S, localVariable);
localVariableCount++;
}
else if (parameterType.IsValueType())
{
{
generator.PushArrayInstance(argsIndex, i);
generator.Emit(OpCodes.Stloc_S, localObject);
@@ -170,7 +167,6 @@ namespace Newtonsoft.Json.Utilities
if (parameterType.IsPrimitive())
{
// for primitive types we need to handle type widening (e.g. short -> int)
MethodInfo toParameterTypeMethod = typeof(IConvertible)
.GetMethod("To" + parameterType.Name, new[] { typeof(IFormatProvider) });
@@ -209,7 +205,6 @@ namespace Newtonsoft.Json.Utilities
// parameter finished, we out!
generator.MarkLabel(finishedProcessingParameter);
localVariableCount++;
}
else
{
@@ -50,8 +50,8 @@
return true;
}
int fromMask = 0,
toMask = 0;
int fromMask = 0;
int toMask = 0;
for (int i = 0; i < PrimitiveTypes.Length; i++)
{