Fixed bug when prefixes try to assign __result and return false

Fixed early bail out of parameter loop in call parameter method Remove debug calls Cleaned up code
pardeike · Feb 12, 2017 · e23cf68 · e23cf68
1 parent 0a571a6
commit e23cf68
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/Harmony/MethodPatcher.cs b/Harmony/MethodPatcher.cs
@@ -51,7 +51,7 @@ public static DynamicMethod CreatePatchedMethod(MethodBase original, List<Method
 			var patch = DynamicTools.CreateDynamicMethod(original, "_Patch" + idx);
 			var il = patch.GetILGenerator();
 			var originalVariables = DynamicTools.DeclareLocalVariables(original, il);
-			var resultVariable = DynamicTools.DeclareReturnVar(il, original);
+			var resultVariable = DynamicTools.DeclareReturnVar(original, il);
 
 			// TODO: this is broken because it has only one var for all patches together.
 			//       to make this useful, we need one var for each patch pair
@@ -61,17 +61,19 @@ public static DynamicMethod CreatePatchedMethod(MethodBase original, List<Method
 			privateVars[RESULT_VAR] = resultVariable;
 			privateVars[STATE_VAR] = privateStateVariable;
 
-			var afterOriginal = il.DefineLabel();
-			AddPrefixes(il, original, prefixes, privateVars, afterOriginal);
+			var afterOriginal1 = il.DefineLabel();
+			var afterOriginal2 = il.DefineLabel();
+			AddPrefixes(il, original, prefixes, privateVars, afterOriginal2);
 
 			var copier = new MethodCopier(original, patch, originalVariables);
 			foreach (var processor in processors)
 				copier.AddReplacement(processor);
-			copier.AddReplacement(new RetToBrAfterProcessor(afterOriginal));
+			copier.AddReplacement(new RetToBrAfterProcessor(afterOriginal1));
 			copier.Emit();
-			il.MarkLabel(afterOriginal);
+			il.MarkLabel(afterOriginal1);
 			if (resultVariable != null)
 				il.Emit(OpCodes.Stloc, resultVariable);
+			il.MarkLabel(afterOriginal2);
 
 			AddPostfixes(il, original, postfixes, privateVars);
 
@@ -128,7 +130,7 @@ static void EmitCallParameter(ILGenerator il, MethodBase original, MethodInfo pa
 				if (patchParam.Name == STATE_VAR)
 				{
 					var ldlocCode = patchParam.ParameterType.IsByRef ? OpCodes.Ldloca : OpCodes.Ldloc;
-					il.Emit(ldlocCode, variables.GetValueSafe(STATE_VAR));
+					il.Emit(ldlocCode, variables[STATE_VAR]);
 					continue;
 				}
 
@@ -137,7 +139,7 @@ static void EmitCallParameter(ILGenerator il, MethodBase original, MethodInfo pa
 					if (AccessTools.GetReturnedType(original) == typeof(void))
 						throw new Exception("Cannot get result from void method " + original);
 					var ldlocCode = patchParam.ParameterType.IsByRef ? OpCodes.Ldloca : OpCodes.Ldloc;
-					il.Emit(ldlocCode, variables.GetValueSafe(RESULT_VAR));
+					il.Emit(ldlocCode, variables[RESULT_VAR]);
 					continue;
 				}
 
@@ -159,14 +161,14 @@ static void EmitCallParameter(ILGenerator il, MethodBase original, MethodInfo pa
 				if (originalIsNormal == patchIsNormal)
 				{
 					il.Emit(OpCodes.Ldarg, patchArgIndex);
-					return;
+					continue;
 				}
 
 				// Case 2
 				if (originalIsNormal && patchIsNormal == false)
 				{
 					il.Emit(OpCodes.Ldarga, patchArgIndex);
-					return;
+					continue;
 				}
 
 				// Case 3

diff --git a/Harmony/PatchFunctions.cs b/Harmony/PatchFunctions.cs
@@ -71,14 +71,8 @@ public static void UpdateWrapper(MethodBase original, PatchInfo patchInfo)
 			var replacement = MethodPatcher.CreatePatchedMethod(original, sortedPrefixes, sortedPostfixes, sortedProcessors);
 			if (replacement == null) throw new MissingMethodException("Cannot create dynamic replacement for " + original);
 
-			FileLog.Log("Getting code start for " + original);
 			var originalCodeStart = Memory.GetMethodStart(original);
-			FileLog.Log("=> " + originalCodeStart);
-
-			FileLog.Log("Getting code start for " + original);
 			var patchCodeStart = Memory.GetMethodStart(replacement);
-			FileLog.Log("=> " + patchCodeStart);
-
 			Memory.WriteJump(originalCodeStart, patchCodeStart);
 
 			PatchTools.RememberObject(original, replacement); // no gc for new value + release old value to gc

diff --git a/Harmony/Tools/DynamicTools.cs b/Harmony/Tools/DynamicTools.cs
@@ -42,7 +42,7 @@ public static LocalBuilder[] DeclareLocalVariables(MethodBase original, ILGenera
 			).ToArray();
 		}
 
-		public static LocalBuilder DeclareReturnVar(ILGenerator il, MethodBase original)
+		public static LocalBuilder DeclareReturnVar(MethodBase original, ILGenerator il)
 		{
 			var type = AccessTools.GetReturnedType(original);
 			if (AccessTools.isClass(type))