Skip to content

Add more DataFlow tests from linker to NativeAOT #72777

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.

Sign up for GitHub

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

Merged
vitek-karas merged 7 commits into from
Aug 1, 2022
Merged

Add more DataFlow tests from linker to NativeAOT #72777

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a44d9a2
Add more DataFlow tests from linker to NativeAOT
vitek-karas Jul 13, 2022
90b13ab
Test updates from linker
vitek-karas Jul 25, 2022
86f5b9f
Merge remote-tracking branch 'dotnet/main' into AotTests2
vitek-karas Jul 25, 2022
c1ca4bc
Improve attribute data flow by providing the correct MessageOrigin. T…
vitek-karas Jul 25, 2022
4025601
Fix a bug in ref-return-value data flow
vitek-karas Jul 27, 2022
a8646f6
Fix attribute parent calculation by forcing it to be passed from the …
vitek-karas Jul 28, 2022
e2d6acb
Handle multi-dimensional array Address method
vitek-karas Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix a bug in ref-return-value data flow 
This was missed during porting of the changes from linker.

More cleanup of tests.
  • Loading branch information
@vitek-karas
vitek-karas committed Jul 27, 2022
commit 4025601ae66fbe6c4061226a6e824d775242b4ac
13 changes: 1 addition & 12 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/MethodBodyScanner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,18 +993,7 @@ private void ScanIndirectStore(
StackSlot valueToStore = PopUnknown(currentStack, 1, methodBody, offset);
StackSlot destination = PopUnknown(currentStack, 1, methodBody, offset);

foreach (var uniqueDestination in destination.Value)
{
if (uniqueDestination is FieldValue fieldDestination)
{
HandleStoreField(methodBody, offset, fieldDestination, valueToStore.Value);
}
else if (uniqueDestination is MethodParameterValue parameterDestination)
{
HandleStoreParameter(methodBody, offset, parameterDestination, valueToStore.Value);
}
}

StoreInReference(destination.Value, valueToStore.Value, methodBody, offset, locals, curBasicBlock);
}

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/tools/aot/Mono.Linker.Tests.Cases/DataFlow/ArrayDataFlow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ static void TestArrayWithInitializerMultipleElementsStaticType ()
}

// Bug
// [ExpectedWarning ("IL2087", nameof (DataFlowTypeExtensions.RequiresPublicFields), ProducedBy = ProducedBy.Trimmer)]
// [ExpectedWarning ("IL2087", nameof (DataFlowTypeExtensions.RequiresPublicFields), ProducedBy = ProducedBy.Trimmer | ProducedBy.NativeAot)]
[ExpectedWarning ("IL2062", nameof (DataFlowTypeExtensions.RequiresPublicMethods), ProducedBy = ProducedBy.Trimmer | ProducedBy.NativeAot)]
// Below are because we do not handle Multi dimensional arrays
[ExpectedWarning ("IL2062", nameof (DataFlowTypeExtensions.RequiresAll), ProducedBy = ProducedBy.Trimmer | ProducedBy.NativeAot)]
Expand Down Expand Up @@ -396,7 +396,7 @@ static void TestArraySetElementMultipleElementsStaticType ()
}

// Bug
// [ExpectedWarning ("IL2087", nameof (DataFlowTypeExtensions.RequiresPublicFields), ProducedBy = ProducedBy.Trimmer)]
// [ExpectedWarning ("IL2087", nameof (DataFlowTypeExtensions.RequiresPublicFields), ProducedBy = ProducedBy.Trimmer | ProducedBy.NativeAot)]
[ExpectedWarning ("IL2062", nameof (DataFlowTypeExtensions.RequiresPublicMethods), ProducedBy = ProducedBy.Trimmer | ProducedBy.NativeAot)]
// Below are because we do not handle Multi dimensional arrays
[ExpectedWarning ("IL2062", nameof (DataFlowTypeExtensions.RequiresPublicFields), ProducedBy = ProducedBy.Trimmer | ProducedBy.NativeAot)]
Expand All @@ -418,7 +418,7 @@ static void TestArraySetElementMultipleElementsStaticType ()
}

// Bug
// [ExpectedWarning ("IL2087", nameof (DataFlowTypeExtensions.RequiresPublicFields), ProducedBy = ProducedBy.Trimmer)]
// [ExpectedWarning ("IL2087", nameof (DataFlowTypeExtensions.RequiresPublicFields), ProducedBy = ProducedBy.Trimmer | ProducedBy.NativeAot)]
[ExpectedWarning ("IL2062", nameof (DataFlowTypeExtensions.RequiresPublicMethods), ProducedBy = ProducedBy.Trimmer | ProducedBy.NativeAot)]
// Below are because we do not handle Multi dimensional arrays
[ExpectedWarning ("IL2062", nameof (DataFlowTypeExtensions.RequiresPublicFields), ProducedBy = ProducedBy.Trimmer | ProducedBy.NativeAot)]
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/tools/aot/Mono.Linker.Tests.Cases/DataFlow/AssemblyQualifiedNameDataflow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ static void TestConstructors ()
RequireNothing (type);
}

// NativeAOT doesn't implement this yet: https://github.com/dotnet/runtime/issues/72833
[ExpectedWarning ("IL2105",
"Type 'System.Invalid.TypeName' was not found in the caller assembly nor in the base library. " +
"Type name strings used for dynamically accessing a type should be assembly qualified.",
Expand Down
Loading