Merge pull request #10 from tonerdo/improve-coverage-accuracy

ensure instrumentation code becomes the new target
coverlet-coverage · Mar 22, 2018 · 2639aad · 2639aad
2 parents 87135a5 + d525863
commit 2639aad
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/coverlet.core/Instrumentation/Instrumenter.cs b/src/coverlet.core/Instrumentation/Instrumenter.cs
@@ -138,20 +138,21 @@ private Instruction AddInstrumentationCode(MethodDefinition method, ILProcessor
 
         private void ReplaceInstructionTarget(Instruction instruction, Instruction oldTarget, Instruction newTarget)
         {
-            if (!(instruction.Operand is Instruction _instruction)
-                || !(instruction.Operand is Instruction[] _instructions))
-                return;
-
-            if (_instruction == oldTarget)
+            if (instruction.Operand is Instruction _instruction)
             {
-                instruction.Operand = newTarget;
-                return;
+                if (_instruction == oldTarget)
+                {
+                    instruction.Operand = newTarget;
+                    return;
+                }
             }
-
-            for (int i = 0; i < _instructions.Length; i++)
+            else if (instruction.Operand is Instruction[] _instructions)
             {
-                if (_instructions[i] == oldTarget)
-                    _instructions[i] = newTarget;
+                for (int i = 0; i < _instructions.Length; i++)
+                {
+                    if (_instructions[i] == oldTarget)
+                        _instructions[i] = newTarget;
+                }
             }
         }