-
Notifications
You must be signed in to change notification settings - Fork 4.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix duplicated FldSeq in block morphing #62687
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
using System.Runtime.CompilerServices; | ||
|
||
// In this test, we have a block assignment with a source that is a promoted struct and | ||
// an indirect destination. When morphing it, we would decompose that assignment into a series | ||
// of field assignments: `IND(ADDR) = FirstLngValue; IND(ADDR_CLONE + 8) = SecondLngValue`. | ||
// In the process, we would also attach field sequences to the destination addresses so that VN | ||
// knew to analyze them. That was the part which was susceptible to the bug being tested: morphing | ||
// reused the address node (the "firstElem" LCL_VAR) for the first field, and at the same time | ||
// used it to create more copies for subsequent addresses. | ||
// | ||
// Thus: | ||
// 1) A zero-offset field sequence for the first field was attached to ADDR | ||
// 2) ADDR was cloned, the clone still had the sequence attached | ||
// 3) ADD(ADDR_CLONE [FldSeq FirstLngValue], 8 [FldSeq SecondLngValue]) was created. | ||
// | ||
// And so we ended up with an incorrect FldSeq: [FirstLngValue, SecondLngValue], causing | ||
// VN to wrongly treat the "firstElem = b" store as not modifiying SecondLngValue. | ||
// | ||
// The fix was to reuse the address for the last field instead. | ||
|
||
class FldSeqsInPromotedCpBlk | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you add a comment linking this test to the PR and/or describing the problem this test is supposed to cover? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added one, hopefully it captures the problem precisely enough. |
||
{ | ||
public static int Main() | ||
{ | ||
PromotableStruct s = default; | ||
return Problem(new PromotableStruct[1]) == 2 ? 100 : 101; | ||
} | ||
|
||
[MethodImpl(MethodImplOptions.NoInlining)] | ||
private static long Problem(PromotableStruct[] a) | ||
{ | ||
ref var firstElem = ref a[0]; | ||
|
||
firstElem.SecondLngValue = 1; | ||
var b = new PromotableStruct() { SecondLngValue = 2 }; | ||
|
||
if (firstElem.SecondLngValue == 1) | ||
{ | ||
firstElem = b; | ||
return firstElem.SecondLngValue; | ||
} | ||
|
||
return -1; | ||
} | ||
} | ||
|
||
struct PromotableStruct | ||
{ | ||
public long FirstLngValue; | ||
public long SecondLngValue; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
<PropertyGroup> | ||
<OutputType>Exe</OutputType> | ||
<CLRTestPriority>1</CLRTestPriority> | ||
</PropertyGroup> | ||
<PropertyGroup> | ||
<DebugType>None</DebugType> | ||
<Optimize>True</Optimize> | ||
</PropertyGroup> | ||
<ItemGroup> | ||
<Compile Include="$(MSBuildProjectName).cs" /> | ||
</ItemGroup> | ||
</Project> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we assert that we're not reusing an address with a zero offset field seq?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, it is legal for the address to contain a zero-offset sequence before the morphing, so I suppose asserting here would require:
fgAddFieldSeqForZeroOffset
does).I am not sure it is worth the amount of code required. Once #58312 is finished, we will have asserts in VN that would have caught this case.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not a fan of how we handle the zero offset case today. We've had a number of bugs in this area.
Ok by me if it is too hard to check -- just wanted to see if you had any ideas.