UsingVar

dotnet · May 21, 2022 · 56847a9 · 56847a9
1 parent 86bcdcb
commit 56847a9
Show file tree

Hide file tree

Showing 3 changed files with 335 additions and 24 deletions.
diff --git a/...mpilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.cs b/...mpilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.cs
@@ -463,9 +463,10 @@ private IteratorFinallyFrame PushFrame(BoundTryStatement statement)
             // these nodes have to be tracked by the IDE EnC analyzer
             Debug.Assert(
                 syntax.IsKind(SyntaxKind.TryStatement) ||
+                syntax.IsKind(SyntaxKind.UsingStatement) ||
+                syntax.IsKind(SyntaxKind.LocalDeclarationStatement) ||
                 syntax.IsKind(SyntaxKind.ForEachStatement) ||
-                syntax.IsKind(SyntaxKind.LockStatement) ||
-                syntax.IsKind(SyntaxKind.UsingStatement));
+                syntax.IsKind(SyntaxKind.LockStatement));
 
             if (slotAllocatorOpt?.TryGetPreviousStateMachineState(syntax, out var finalizeState) != true)
             {

diff --git a/src/Compilers/CSharp/Portable/Lowering/StateMachineRewriter/MethodToStateMachineRewriter.cs b/src/Compilers/CSharp/Portable/Lowering/StateMachineRewriter/MethodToStateMachineRewriter.cs
@@ -232,12 +232,13 @@ protected void AddResumableState(SyntaxNode awaitOrYieldReturnSyntax, out int st
         protected void AddStateDebugInfo(SyntaxNode node, int stateNumber)
         {
             Debug.Assert(
+                node.IsKind(SyntaxKind.AwaitExpression) ||
+                node.IsKind(SyntaxKind.YieldReturnStatement) ||
                 node.IsKind(SyntaxKind.TryStatement) ||
-                node.IsKind(SyntaxKind.LockStatement) ||
                 node.IsKind(SyntaxKind.UsingStatement) ||
-                node.IsKind(SyntaxKind.ForEachStatement) ||
-                node.IsKind(SyntaxKind.AwaitExpression) ||
-                node.IsKind(SyntaxKind.YieldReturnStatement));
+                node.IsKind(SyntaxKind.LocalDeclarationStatement) ||
+                node.IsKind(SyntaxKind.LockStatement) ||
+                node.IsKind(SyntaxKind.ForEachStatement));
 
             int syntaxOffset = CurrentMethod.CalculateLocalSyntaxOffset(node.SpanStart, node.SyntaxTree);
             _stateDebugInfoBuilder.Add(new StateMachineStateDebugInfo(syntaxOffset, stateNumber));