Skip to content

Fix #3825: reconstruct async iterators with [EnumeratorCancellation] and await in finally #3831

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.

Sign up for GitHub

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

Open
sailro wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −0
Open

Fix #3825: reconstruct async iterators with [EnumeratorCancellation] and await in finally #3831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ICSharpCode.Decompiler.Tests/TestCases/Pretty/AsyncStreams.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,20 @@ public static async IAsyncEnumerable<int> CountToWithConfigureAwait(int until)
await Task.Delay(10).ConfigureAwait(continueOnCapturedContext: false);
}
}

public static async IAsyncEnumerable<int> AwaitInFinallyWithCancellation([EnumeratorCancellation] CancellationToken cancellationToken)
{
await Task.Yield();
try
{
yield return 1;
await Task.Delay(10, cancellationToken);
}
finally
{
await Task.Yield();
}
}
}

public struct TestStruct
Expand Down
11 changes: 11 additions & 0 deletions ICSharpCode.Decompiler/IL/ControlFlow/AsyncAwaitDecompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,6 +911,11 @@ private Block CheckSetResultReturnBlock(BlockContainer blockContainer, int setRe
finalStateKnown = true;
pos++;

// [optional] stfld <>u__N(ldloc this, ldnull)
// The hoisted-local cleanup may appear either before or after the combined-tokens disposal
// (the latter is present for async iterators with an [EnumeratorCancellation] token).
MatchHoistedLocalCleanup(block, ref pos);

if (pos + 2 == block.Instructions.Count && block.MatchIfAtEndOfBlock(out var condition, out var trueInst, out var falseInst))
{
if (MatchDisposeCombinedTokens(blockContainer, condition, trueInst, falseInst, blocksAnalyzed, out var setResultAndExitBlock))
Expand Down Expand Up @@ -1088,6 +1093,12 @@ void ValidateCatchBlock()
finalState = newState;
finalStateKnown = true;
}

// [optional] stfld <>u__N(ldloc this, ldnull)
// The hoisted-local cleanup may appear either before or after the combined-tokens disposal
// (the latter is present for async iterators with an [EnumeratorCancellation] token).
MatchHoistedLocalCleanup(catchBlock, ref pos);

if (pos + 2 == catchBlock.Instructions.Count && catchBlock.MatchIfAtEndOfBlock(out var condition, out var trueInst, out var falseInst))
{
if (MatchDisposeCombinedTokens(handlerContainer, condition, trueInst, falseInst, blocksAnalyzed, out var setResultAndExitBlock))
Expand Down
Loading