pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Do not match lock if lockObj is used in or after the try block.

pull/863/head
Siegfried Pammer 8 years ago
parent
43d696ab28
commit
8285d01cad
1 changed files with 6 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      ICSharpCode.Decompiler/IL/Transforms/LockTransform.cs

6
ICSharpCode.Decompiler/IL/Transforms/LockTransform.cs
Unescape View File

@ -60,6 +60,8 @@ namespace ICSharpCode.Decompiler.IL.Transforms
return false; return false;
if (!(body.FinallyBlock is BlockContainer finallyContainer) || !MatchExitBlock(finallyContainer.EntryPoint, null, objectStore.Variable)) if (!(body.FinallyBlock is BlockContainer finallyContainer) || !MatchExitBlock(finallyContainer.EntryPoint, null, objectStore.Variable))
return false; return false;
if (objectStore.Variable.LoadCount > 1)
return false;
context.Step("LockTransformV2", block); context.Step("LockTransformV2", block);
block.Instructions.RemoveAt(i - 1); block.Instructions.RemoveAt(i - 1);
block.Instructions.RemoveAt(i - 2); block.Instructions.RemoveAt(i - 2);
@ -102,6 +104,8 @@ namespace ICSharpCode.Decompiler.IL.Transforms
return false; return false;
if (!(body.FinallyBlock is BlockContainer finallyContainer) || !MatchExitBlock(finallyContainer.EntryPoint, flagStore.Variable, objectStore.Variable)) if (!(body.FinallyBlock is BlockContainer finallyContainer) || !MatchExitBlock(finallyContainer.EntryPoint, flagStore.Variable, objectStore.Variable))
return false; return false;
if (objectStore.Variable.LoadCount > 1)
return false;
context.Step("LockTransformV4", block); context.Step("LockTransformV4", block);
block.Instructions.RemoveAt(i - 1); block.Instructions.RemoveAt(i - 1);
tryContainer.EntryPoint.Instructions.RemoveAt(0); tryContainer.EntryPoint.Instructions.RemoveAt(0);
@ -145,6 +149,8 @@ namespace ICSharpCode.Decompiler.IL.Transforms
return false; return false;
if (!(body.FinallyBlock is BlockContainer finallyContainer) || !MatchExitBlock(finallyContainer.EntryPoint, flagStore.Variable, objectStore.Variable)) if (!(body.FinallyBlock is BlockContainer finallyContainer) || !MatchExitBlock(finallyContainer.EntryPoint, flagStore.Variable, objectStore.Variable))
return false; return false;
if (objectStore.Variable.LoadCount > 2)
return false;
context.Step("LockTransformRoslyn", block); context.Step("LockTransformRoslyn", block);
block.Instructions.RemoveAt(i - 1); block.Instructions.RemoveAt(i - 1);
block.Instructions.RemoveAt(i - 2); block.Instructions.RemoveAt(i - 2);

Write Preview
Loading…
Cancel
Save