Don't overwrite interpolation data during nullable rewrite.

dotnet · Jul 22, 2021 · 0f97ce1 · 0f97ce1
1 parent e007e2d
commit 0f97ce1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Compilers/CSharp/Portable/BoundTree/BoundBinaryOperator.UncommonData.cs b/src/Compilers/CSharp/Portable/BoundTree/BoundBinaryOperator.UncommonData.cs
@@ -59,6 +59,16 @@ private UncommonData(ConstantValue? constantValue, MethodSymbol? method, TypeSym
                 IsUnconvertedInterpolatedStringAddition = isUnconvertedInterpolatedStringAddition;
                 InterpolatedStringHandlerData = interpolatedStringHandlerData;
             }
+
+            public UncommonData WithUpdatedMethod(MethodSymbol? method)
+            {
+                if ((object?)method == Method)
+                {
+                    return this;
+                }
+
+                return new UncommonData(ConstantValue, method, ConstrainedToType, OriginalUserDefinedOperatorsOpt, IsUnconvertedInterpolatedStringAddition, InterpolatedStringHandlerData);
+            }
         }
     }
 }
diff --git a/src/Compilers/CSharp/Portable/BoundTree/NullabilityRewriter.cs b/src/Compilers/CSharp/Portable/BoundTree/NullabilityRewriter.cs
@@ -39,7 +39,7 @@ private BoundNode VisitBinaryOperatorBase(BoundBinaryOperatorBase binaryOperator
                 stack.Push(currentBinary);
                 currentBinary = currentBinary.Left as BoundBinaryOperatorBase;
             }
-            while (currentBinary is object);
+            while (currentBinary is not null);
 
             Debug.Assert(stack.Count > 0);
             var leftChild = (BoundExpression)Visit(stack.Peek().Left);
@@ -56,7 +56,7 @@ private BoundNode VisitBinaryOperatorBase(BoundBinaryOperatorBase binaryOperator
                 {
                     BoundBinaryOperator binary => binary.Update(
                         binary.OperatorKind,
-                        BoundBinaryOperator.UncommonData.CreateIfNeeded(binary.ConstantValue, GetUpdatedSymbol(binary, binary.Method), binary.ConstrainedToType, binary.OriginalUserDefinedOperatorsOpt),
+                        binary.Data?.WithUpdatedMethod(GetUpdatedSymbol(binary, binary.Method)),
                         binary.ResultKind,
                         leftChild,
                         right,