Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ensure instrumentation code becomes the new target #10

Merged
merged 1 commit into from Mar 22, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/coverlet.core/Instrumentation/Instrumenter.cs
Expand Up @@ -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;
}
}
}

Expand Down