Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
tmat committed May 27, 2022
1 parent bb91827 commit 1f798f4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ internal AsyncIteratorMethodToStateMachineRewriter(MethodSymbol method,
{
var asyncDispatch = base.GenerateMissingStateDispatch();

var iteratorDispatch = _iteratorStateAllocator.GenerateThrowMissingStateDispatch(F, F.Local(cachedState), CodeAnalysisResources.EncCannotResumeSuspenededIteratorMethod);
var iteratorDispatch = _iteratorStateAllocator.GenerateThrowMissingStateDispatch(F, F.Local(cachedState), CodeAnalysisResources.EncCannotResumeSuspendedIteratorMethod);
if (iteratorDispatch == null)
{
return asyncDispatch;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ internal IteratorMethodToStateMachineRewriter(
}

protected override string EncMissingStateMessage
=> CodeAnalysisResources.EncCannotResumeSuspenededIteratorMethod;
=> CodeAnalysisResources.EncCannotResumeSuspendedIteratorMethod;

protected override int FirstIncreasingResumableState
=> StateMachineStates.FirstResumableIteratorState;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4118,7 +4118,7 @@ .locals init (int V_0)
IL_0025: ldloc.0
IL_0026: ldc.i4.1
IL_0027: blt.s IL_0034
IL_0029: ldstr """ + CodeAnalysisResources.EncCannotResumeSuspenededIteratorMethod + @"""
IL_0029: ldstr """ + CodeAnalysisResources.EncCannotResumeSuspendedIteratorMethod + @"""
IL_002e: newobj ""System.InvalidOperationException..ctor(string)""
IL_0033: throw
Expand Down

0 comments on commit 1f798f4

Please sign in to comment.