'with' on anonymous type needs to lower values (#54086)

dotnet · Jun 15, 2021 · e2d605e · e2d605e
1 parent 0e720ce
commit e2d605e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/...ompilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_ObjectCreationExpression.cs b/...ompilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_ObjectCreationExpression.cs
@@ -183,7 +183,8 @@ ImmutableArray<BoundExpression> getAnonymousTypeValues(BoundWithExpression withE
                     Debug.Assert(left.MemberSymbol is not null);
 
                     // We evaluate the values provided in source first
-                    BoundLocal valueTemp = _factory.StoreToTemp(assignment.Right, out BoundAssignmentOperator boundAssignmentToTemp);
+                    var rewrittenRight = VisitExpression(assignment.Right);
+                    BoundLocal valueTemp = _factory.StoreToTemp(rewrittenRight, out BoundAssignmentOperator boundAssignmentToTemp);
                     temps.Add(valueTemp.LocalSymbol);
                     sideEffects.Add(boundAssignmentToTemp);
 

diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/RecordStructTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/RecordStructTests.cs
@@ -9993,6 +9993,35 @@ public static void M()
             VerifyFlowGraphAndDiagnosticsForTest<BlockSyntax>(src, expectedFlowGraph, expectedDiagnostics, parseOptions: TestOptions.RegularPreview);
         }
 
+        [Fact, WorkItem(53849, "https://github.com/dotnet/roslyn/issues/53849")]
+        public void WithExpr_AnonymousType_ValueIsLoweredToo()
+        {
+            var src = @"
+var x = new { Property = 42 };
+var adjusted = x with { Property = x.Property + 2 };
+
+System.Console.WriteLine(adjusted);
+";
+            var comp = CreateCompilation(src, parseOptions: TestOptions.RegularPreview);
+            var verifier = CompileAndVerify(comp, expectedOutput: "{ Property = 44 }");
+            verifier.VerifyDiagnostics();
+        }
+
+        [Fact, WorkItem(53849, "https://github.com/dotnet/roslyn/issues/53849")]
+        public void WithExpr_AnonymousType_ValueIsLoweredToo_NestedWith()
+        {
+            var src = @"
+var x = new { Property = 42 };
+var container = new { Item = x };
+var adjusted = container with { Item = x with { Property = x.Property + 2 } };
+
+System.Console.WriteLine(adjusted);
+";
+            var comp = CreateCompilation(src, parseOptions: TestOptions.RegularPreview);
+            var verifier = CompileAndVerify(comp, expectedOutput: "{ Item = { Property = 44 } }");
+            verifier.VerifyDiagnostics();
+        }
+
         [Fact]
         public void AttributesOnPrimaryConstructorParameters_01()
         {