Skip to content

Commit

Permalink
SpillSequenceSpiller.Spill - ensure sequences under ref assignments a…
Browse files Browse the repository at this point in the history 
…re spilled. (#58657)

Fixes #58569.
  • Loading branch information
@AlekseyTs
AlekseyTs committed Jan 10, 2022
1 parent 09af9e4 commit f51c1b2
Show file tree
Hide file tree
Showing 2 changed files with 223 additions and 3 deletions.
21 changes: 18 additions & 3 deletions src/Compilers/CSharp/Portable/Lowering/SpillSequenceSpiller.cs
View file
Expand Up @@ -311,11 +311,26 @@ private BoundStatement UpdateStatement(BoundSpillSequenceBuilder builder, BoundS
continue;

case BoundKind.Sequence:
// neither the side-effects nor the value of the sequence contains await
// (otherwise it would be converted to a SpillSequenceBuilder).
if (refKind != RefKind.None)
{
return expression;
var sequence = (BoundSequence)expression;

PromoteAndAddLocals(builder, sequence.Locals);
builder.AddExpressions(sequence.SideEffects);
expression = sequence.Value;
continue;
}

goto default;

case BoundKind.AssignmentOperator:
var assignment = (BoundAssignmentOperator)expression;
if (assignment.IsRef &&
assignment is not { Left.Kind: BoundKind.Local, Right.Kind: BoundKind.ArrayAccess }) // Optimize for some known to be safe scenarios.
{
var left = Spill(builder, assignment.Left, RefKind.Ref);
var right = Spill(builder, assignment.Right, RefKind.Ref);
expression = assignment.Update(left, right, assignment.IsRef, assignment.Type);
}

goto default;
Expand Down
205 changes: 205 additions & 0 deletions src/Compilers/CSharp/Test/Emit/CodeGen/IndexAndRangeTests.cs
View file
Expand Up @@ -3582,5 +3582,210 @@ class C
Diagnostic(ErrorCode.WRN_NullReferenceReceiver, "c").WithLocation(10, 5)
);
}

[Fact]
public void PatternIndexArrayAndAwait_01()
{
var src = @"
class C
{
static async System.Threading.Tasks.Task M1(int[] arr)
{
arr[^1] = await System.Threading.Tasks.Task.FromResult(0);
}
static async System.Threading.Tasks.Task Main()
{
var arr = new[] { 123 };
System.Console.WriteLine(arr[0]);
await M1(arr);
System.Console.WriteLine(arr[0]);
}
}
";
CompileAndVerifyWithIndexAndRange(src, expectedOutput:
@"
123
0
").VerifyDiagnostics();
}

[Fact]
public void PatternIndexArrayAndAwait_02()
{
var src = @"
class C
{
static async System.Threading.Tasks.Task M1(int[] arr)
{
(arr[^1], arr[0]) = (123, await System.Threading.Tasks.Task.FromResult(124));
}
static async System.Threading.Tasks.Task Main()
{
var arr = new int[2];
await M1(arr);
System.Console.WriteLine(arr[0]);
System.Console.WriteLine(arr[1]);
}
}
";
CompileAndVerifyWithIndexAndRange(src, expectedOutput:
@"
124
123
").VerifyDiagnostics();
}

[Fact]
public void PatternIndexArrayAndAwait_03()
{
var src = @"
class C
{
static async System.Threading.Tasks.Task M1((int x, int y)[] arr)
{
arr[^1].x = await System.Threading.Tasks.Task.FromResult(124);
}
static async System.Threading.Tasks.Task Main()
{
var arr = new (int x, int y)[1];
await M1(arr);
System.Console.WriteLine(arr[0].x);
}
}
";
CompileAndVerifyWithIndexAndRange(src, expectedOutput:
@"
124
").VerifyDiagnostics();
}

[Fact]
[WorkItem(58569, "https://github.com/dotnet/roslyn/issues/58569")]
public void PatternIndexArrayAndAwait_04()
{
var src = @"
class C
{
static async System.Threading.Tasks.Task M1((int x, int y)[] arr)
{
(arr[^1].x, arr[0].y) = (123, await System.Threading.Tasks.Task.FromResult(124));
}
static async System.Threading.Tasks.Task Main()
{
var arr = new (int x, int y)[2];
await M1(arr);
System.Console.WriteLine(arr[0].y);
System.Console.WriteLine(arr[1].x);
}
}
";
CompileAndVerifyWithIndexAndRange(src, expectedOutput:
@"
124
123
").VerifyDiagnostics();
}

[Fact]
[WorkItem(58569, "https://github.com/dotnet/roslyn/issues/58569")]
public void PatternIndexArrayAndAwait_05()
{
var src = @"
class C
{
static async System.Threading.Tasks.Task M1((int x, int y)[] arr)
{
arr[^1].x += await System.Threading.Tasks.Task.FromResult(124);
}
static async System.Threading.Tasks.Task Main()
{
var arr = new (int x, int y)[] { (1, 2) };
await M1(arr);
System.Console.WriteLine(arr[0].x);
}
}
";
CompileAndVerifyWithIndexAndRange(src, expectedOutput:
@"
125
").VerifyDiagnostics();
}

[Fact]
public void PatternIndexArrayAndAwait_06()
{
var src = @"
class C
{
static async System.Threading.Tasks.Task M1(int[] arr)
{
arr[^1] += await System.Threading.Tasks.Task.FromResult(124);
}
static async System.Threading.Tasks.Task Main()
{
var arr = new int[] { 1 };
await M1(arr);
System.Console.WriteLine(arr[0]);
}
}
";
CompileAndVerifyWithIndexAndRange(src, expectedOutput:
@"
125
").VerifyDiagnostics();
}

[Fact]
public void PatternIndexArrayAndAwait_07()
{
var src = @"
class C
{
static async System.Threading.Tasks.Task M1(int[][] arr)
{
arr[^1][0] += await System.Threading.Tasks.Task.FromResult(124);
}
static async System.Threading.Tasks.Task Main()
{
var arr = new[] { new[] { 1 } };
await M1(arr);
System.Console.WriteLine(arr[0][0]);
}
}
";
CompileAndVerifyWithIndexAndRange(src, expectedOutput:
@"
125
").VerifyDiagnostics();
}

[Fact]
public void PatternIndexArrayAndAwait_08()
{
var src = @"
class C
{
static async System.Threading.Tasks.Task M1((int x, int y)[] arr)
{
(arr[1..][^1].x, arr[1..][0].y) = (123, await System.Threading.Tasks.Task.FromResult(124));
}
static async System.Threading.Tasks.Task Main()
{
var arr = new (int x, int y)[5];
await M1(arr);
System.Console.WriteLine(""Done"");
}
}
";
CompileAndVerifyWithIndexAndRange(src, expectedOutput: "Done").VerifyDiagnostics();
}
}
}

0 comments on commit f51c1b2

Please sign in to comment.