Cherry-pick relevant changes from other PR

dotnet · Mar 5, 2024 · fbe5cdf · fbe5cdf
1 parent 9ed6e9d
commit fbe5cdf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/AbstractFlowPass.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/AbstractFlowPass.cs
@@ -3043,7 +3043,7 @@ public override BoundNode VisitLoweredIsPatternExpression(BoundLoweredIsPatternE
         {
             var savedState = this.State.Clone();
             VisitStatements(node.Statements);
-            this.State = savedState;
+            SetState(savedState);
             return null;
         }
 

diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_IsPatternOperator.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_IsPatternOperator.cs
@@ -121,16 +121,13 @@ internal BoundExpression LowerGeneralIsPattern(BoundIsPatternExpression node, Bo
 
                 // lower the decision dag.
                 ImmutableArray<BoundStatement> loweredDag = LowerDecisionDagCore(decisionDag);
-                var resultBuilder = ArrayBuilder<BoundStatement>.GetInstance(loweredDag.Length + _statements.Count);
-                resultBuilder.AddRange(loweredDag);
-                resultBuilder.AddRange(_statements);
                 return _factory.Sequence(
                     _tempAllocator.AllTemps(),
                     sideEffectsBuilder.ToImmutableAndFree(),
                     new BoundLoweredIsPatternExpression(
                         node.Syntax,
                         // Note: it is not expected for this node to trigger spilling
-                        resultBuilder.ToImmutableAndFree(),
+                        loweredDag.AddRange(_statements),
                         node.WhenTrueLabel,
                         node.WhenFalseLabel,
                         node.Type));