Bug fix - Method copying was not correctly done for OpCode.Switch

reflection-emit · reflection-emit · commit a1fb4a03c436 · 2017-03-30T16:48:05.000+02:00
diff --git a/Interception/Cauldron.Interception.Cecilator/Extension.cs b/Interception/Cauldron.Interception.Cecilator/Extension.cs
@@ -2,12 +2,9 @@
 using Mono.Cecil.Cil;
 using Mono.Cecil.Rocks;
 using System;
-using System.Collections;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace Cauldron.Interception.Cecilator
 {
@@ -315,6 +312,15 @@ public static IEnumerable<TypeReference> GetNestedTypes(this TypeReference type)
 
         public static bool Implements(this TypeReference type, string interfaceName) => type.GetInterfaces().Any(x => x.FullName == interfaceName);
 
+        public static int IndexOf(this Mono.Collections.Generic.Collection<Instruction> instructions, int offset)
+        {
+            for (int i = 0; i < instructions.Count; i++)
+                if (instructions[i].Offset == offset)
+                    return i;
+
+            return -1;
+        }
+
         public static bool IsAssignableFrom(this BuilderType target, BuilderType source) =>
                             target == source ||
             target.typeDefinition == source.typeDefinition ||
diff --git a/Interception/Cauldron.Interception.Cecilator/InstructionsSet.cs b/Interception/Cauldron.Interception.Cecilator/InstructionsSet.cs
@@ -143,9 +143,11 @@ public Method Copy(Modifiers modifiers, string newName)
             var instructionAction = new Func<Instruction, int, Instruction>((item, i) =>
             {
                 var operand = item.Operand as Instruction;
-                var index = this.method.methodDefinition.Body.Instructions.IndexOf(operand);
+                var index = this.method.methodDefinition.Body.Instructions.IndexOf(operand?.Offset ?? item.Offset);
                 jumps.Add(new Tuple<int, int>(i, index));
 
+                this.LogInfo($"IL_{item.Offset.ToString("X4")}: {i} {index}");
+
                 var instruction = methodProcessor.Create(OpCodes.Nop);
                 instruction.OpCode = item.OpCode;
                 return instruction;
