StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplifies proxy method IL a bit

This commit is contained in:
Shockah 2022-02-09 21:10:20 +01:00
parent 354527bb81
commit d9599a3a0a
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/SMAPI/Framework/Reflection/InterfaceProxyBuilder.cs
View File

@ -247,28 +247,16 @@ namespace StardewModdingAPI.Framework.Reflection
{
ILGenerator il = methodBuilder.GetILGenerator();
void EmitCallInstance()
{
// load target instance
il.Emit(OpCodes.Ldarg_0);
il.Emit(OpCodes.Ldfld, instanceField);
var resultLocal = il.DeclareLocal(typeof(object)); // we store both unmodified and modified in here, hence `object`
il.Emit(OpCodes.Ldarg_0);
il.Emit(OpCodes.Ldfld, instanceField);
for (int i = 0; i < argTypes.Length; i++)
il.Emit(OpCodes.Ldarg, i + 1);
il.Emit(OpCodes.Callvirt, target);
il.Emit(OpCodes.Stloc, resultLocal);
// invoke target method on instance
for (int i = 0; i < argTypes.Length; i++)
il.Emit(OpCodes.Ldarg, i + 1);
il.Emit(OpCodes.Callvirt, target);
}
if (returnValueProxyTypeName == null)
if (returnValueProxyTypeName != null)
{
EmitCallInstance();
}
else
{
var resultLocal = il.DeclareLocal(typeof(object)); // we store both unmodified and modified in here
EmitCallInstance();
il.Emit(OpCodes.Stloc, resultLocal);
// if (unmodifiedResultLocal == null) jump
var isNullLabel = il.DefineLabel();
il.Emit(OpCodes.Ldloc, resultLocal);
@ -282,10 +270,10 @@ namespace StardewModdingAPI.Framework.Reflection
il.Emit(OpCodes.Stloc, resultLocal);
il.MarkLabel(isNullLabel);
il.Emit(OpCodes.Ldloc, resultLocal);
}
// return result
il.Emit(OpCodes.Ldloc, resultLocal);
il.Emit(OpCodes.Ret);
}
}