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

Use ILRange API in AsyncAwaitDecompiler.

pull/1440/head
Siegfried Pammer 7 years ago
parent
c1fca21e8a
commit
ab55086cd7
1 changed files with 3 additions and 3 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/ControlFlow/AsyncAwaitDecompiler.cs

6
ICSharpCode.Decompiler/IL/ControlFlow/AsyncAwaitDecompiler.cs
Unescape View File

@ -436,7 +436,7 @@ namespace ICSharpCode.Decompiler.IL.ControlFlow
if (!handler.Filter.MatchLdcI4(1)) if (!handler.Filter.MatchLdcI4(1))
throw new SymbolicAnalysisFailedException(); throw new SymbolicAnalysisFailedException();
var catchBlock = YieldReturnDecompiler.SingleBlock(handler.Body); var catchBlock = YieldReturnDecompiler.SingleBlock(handler.Body);
catchHandlerOffset = catchBlock.ILRange.Start; catchHandlerOffset = catchBlock.StartILOffset;
if (catchBlock?.Instructions.Count != 4) if (catchBlock?.Instructions.Count != 4)
throw new SymbolicAnalysisFailedException(); throw new SymbolicAnalysisFailedException();
// stloc exception(ldloc E_143) // stloc exception(ldloc E_143)
@ -568,7 +568,7 @@ namespace ICSharpCode.Decompiler.IL.ControlFlow
block.Instructions.Add(new Await(new LdLoca(awaiterVar))); block.Instructions.Add(new Await(new LdLoca(awaiterVar)));
Block targetBlock = stateToBlockMap.GetOrDefault(state); Block targetBlock = stateToBlockMap.GetOrDefault(state);
if (targetBlock != null) { if (targetBlock != null) {
awaitDebugInfos.Add(new AsyncDebugInfo.Await(yieldOffset, targetBlock.ILRange.Start)); awaitDebugInfos.Add(new AsyncDebugInfo.Await(yieldOffset, targetBlock.StartILOffset));
block.Instructions.Add(new Branch(targetBlock)); block.Instructions.Add(new Branch(targetBlock));
} else { } else {
block.Instructions.Add(new InvalidBranch("Could not find block for state " + state)); block.Instructions.Add(new InvalidBranch("Could not find block for state " + state));
@ -650,7 +650,7 @@ namespace ICSharpCode.Decompiler.IL.ControlFlow
return false; return false;
pos--; pos--;
// Store IL offset for debug info: // Store IL offset for debug info:
yieldOffset = block.Instructions[pos].ILRange.End; yieldOffset = block.Instructions[pos].EndILOffset;
// stloc S_10(ldloc this) // stloc S_10(ldloc this)
// stloc S_11(ldc.i4 0) // stloc S_11(ldc.i4 0)

Write Preview
Loading…
Cancel
Save