Skip to content

Enable more ILLink tests in NativeAOT #85651

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 16 commits into from
May 4, 2023
Merged

Enable more ILLink tests in NativeAOT #85651

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8503092
Implement automatic suppression for CGC->CGC references.
vitek-karas Apr 13, 2023
d965fd8
Fix a null ref and enable another test
vitek-karas Apr 17, 2023
f5aabee
Tests
vitek-karas Apr 18, 2023
abb17a4
Fix hierarchy marking to avoid duplicate warnings
vitek-karas Apr 19, 2023
33768cb
Remove warning generation for reflection access to compiler-generated…
vitek-karas Apr 19, 2023
b7131c4
First
vitek-karas Apr 21, 2023
9815482
More
vitek-karas Apr 21, 2023
f41af39
Fixed inconsistency in illink's behavior around arrays
vitek-karas Apr 24, 2023
e31ba1d
Fix DAM marking to avoid warning noise
vitek-karas Apr 25, 2023
338a724
Revert "Fix DAM marking to avoid warning noise"
vitek-karas Apr 27, 2023
b9117c5
Fix test infra to correctly handle ILAsm inputs
vitek-karas Apr 27, 2023
1e0bcfc
Enable more tests in NativeAOT
vitek-karas Apr 27, 2023
bf697d8
Enable nullable data flow test
vitek-karas Apr 27, 2023
0a90688
Fix linker test
vitek-karas May 2, 2023
0532274
Enable couple more tests
vitek-karas May 2, 2023
817cd9f
PR feedback
vitek-karas May 3, 2023
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
Remove warning generation for reflection access to compiler-generated… 
… code.

#85042
  • Loading branch information
@vitek-karas
vitek-karas committed Apr 24, 2023
commit 33768cb4ebd3e5ddca0daec455bb25af57da8319
103 changes: 0 additions & 103 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/CompilerGeneratedState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using System.Reflection.Metadata;
using ILCompiler.Logging;
using ILLink.Shared;
using ILLink.Shared.TrimAnalysis;
using Internal.IL;
using Internal.TypeSystem;
using Internal.TypeSystem.Ecma;
Expand All @@ -28,12 +27,10 @@ private readonly record struct TypeArgumentInfo(
IReadOnlyList<GenericParameterDesc?>? OriginalAttributes);

private readonly TypeCacheHashtable _typeCacheHashtable;
private DataflowRequirementHashtable? _dataflowRequirementHashtable;

public CompilerGeneratedState(ILProvider ilProvider, Logger logger)
{
_typeCacheHashtable = new TypeCacheHashtable(ilProvider, logger);
_dataflowRequirementHashtable = null;
}

private sealed class TypeCacheHashtable : LockFreeReaderHashtable<MetadataType, TypeCache>
Expand Down Expand Up @@ -665,105 +662,5 @@ public bool TryGetUserMethodForCompilerGeneratedMember(TypeSystemEntity sourceMe

return false;
}

private sealed class DataflowRequirementValue
{
public MethodDesc Method;
public bool RequiresDataflow;

public DataflowRequirementValue(MethodDesc method, FlowAnnotations flowAnnotations)
{
Debug.Assert(method == method.GetTypicalMethodDefinition());
Debug.Assert(IsNestedFunctionOrStateMachineMember(method));

Method = method;

bool requiresDataflowProcessing = ReflectionMethodBodyScanner.RequiresReflectionMethodBodyScannerForMethodBody(flowAnnotations, method);

MethodIL body = flowAnnotations.ILProvider.GetMethodIL(method);
if (body != null)
{
ILReader reader = new ILReader(body.GetILBytes());
while (reader.HasNext)
{
ILOpcode opcode = reader.ReadILOpcode();
switch (opcode)
{
case ILOpcode.newobj:
case ILOpcode.ldftn:
case ILOpcode.ldvirtftn:
case ILOpcode.call:
case ILOpcode.callvirt:
case ILOpcode.jmp:
{
if (body.GetObject(reader.ReadILToken()) is MethodDesc referencedMethod)
requiresDataflowProcessing |= ReflectionMethodBodyScanner.RequiresReflectionMethodBodyScannerForCallSite(flowAnnotations, referencedMethod);
}
break;

case ILOpcode.ldtoken:
{
object referencedObject = body.GetObject(reader.ReadILToken());
if (referencedObject is FieldDesc referencedField)
requiresDataflowProcessing |= ReflectionMethodBodyScanner.RequiresReflectionMethodBodyScannerForAccess(flowAnnotations, referencedField);
else if (referencedObject is MethodDesc referencedMethod)
requiresDataflowProcessing |= ReflectionMethodBodyScanner.RequiresReflectionMethodBodyScannerForCallSite(flowAnnotations, referencedMethod);
}
break;

case ILOpcode.ldfld:
case ILOpcode.ldsfld:
case ILOpcode.ldflda:
case ILOpcode.ldsflda:
case ILOpcode.stfld:
case ILOpcode.stsfld:
{
if (body.GetObject(reader.ReadILToken()) is FieldDesc referencedField)
requiresDataflowProcessing |= ReflectionMethodBodyScanner.RequiresReflectionMethodBodyScannerForAccess(flowAnnotations, referencedField);
}
break;

default:
reader.Skip(opcode);
break;
}
}
}

RequiresDataflow = requiresDataflowProcessing;
}
}

private sealed class DataflowRequirementHashtable : LockFreeReaderHashtable<MethodDesc, DataflowRequirementValue>
{
private FlowAnnotations _flowAnnotations;

public DataflowRequirementHashtable(FlowAnnotations flowAnnotations) => _flowAnnotations = flowAnnotations;

protected override bool CompareKeyToValue(MethodDesc key, DataflowRequirementValue value) => key == value.Method;
protected override bool CompareValueToValue(DataflowRequirementValue value1, DataflowRequirementValue value2) => value1.Method == value2.Method;
protected override int GetKeyHashCode(MethodDesc key) => key.GetHashCode();
protected override int GetValueHashCode(DataflowRequirementValue value) => value.Method.GetHashCode();

protected override DataflowRequirementValue CreateValueFromKey(MethodDesc key)
=> new DataflowRequirementValue(key, _flowAnnotations);
}

public void InitializeFlowAnnotations(FlowAnnotations flowAnnotations)
{
Debug.Assert(_dataflowRequirementHashtable == null);
_dataflowRequirementHashtable = new DataflowRequirementHashtable(flowAnnotations);
}

public bool CompilerGeneratedMethodRequiresDataflow(MethodDesc method)
{
Debug.Assert(IsNestedFunctionOrStateMachineMember(method));

if (_dataflowRequirementHashtable == null)
throw new InvalidOperationException();

method = method.GetTypicalMethodDefinition();
return _dataflowRequirementHashtable.GetOrCreateValue(method).RequiresDataflow;
}
}
}
1 change: 0 additions & 1 deletion src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/FlowAnnotations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public FlowAnnotations(Logger logger, ILProvider ilProvider, CompilerGeneratedSt
_logger = logger;
ILProvider = ilProvider;
CompilerGeneratedState = compilerGeneratedState;
compilerGeneratedState.InitializeFlowAnnotations(this);
}

/// <summary>
Expand Down
8 changes: 4 additions & 4 deletions ...t/Mono.Linker.Tests.Cases/RequiresCapability/ReflectionAccessFromCompilerGeneratedCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ReflectionAccessFromStateMachine
[ExpectedWarning ("IL3002", "--MethodWithLocalFunctionWithRUC.LocalFunction--", CompilerGeneratedCode = true, ProducedBy = Tool.NativeAot)]
[ExpectedWarning ("IL3050", "--MethodWithLocalFunctionWithRUC.LocalFunction--", CompilerGeneratedCode = true, ProducedBy = Tool.NativeAot)]
[ExpectedWarning ("IL2118", nameof (TypeWithMethodWithRequires.MethodWithLocalFunctionCallsRUC), "LocalFunction", CompilerGeneratedCode = true,
ProducedBy = Tool.Trimmer | Tool.NativeAot)]
ProducedBy = Tool.Trimmer)]
[ExpectedWarning ("IL2111", nameof (TypeWithMethodWithRequires.MethodWithAnnotations), CompilerGeneratedCode = true)]
static IEnumerable<int> TestIterator ()
{
Expand All @@ -54,7 +54,7 @@ static IEnumerable<int> TestIteratorWithRUC ()
[ExpectedWarning ("IL3002", "--MethodWithLocalFunctionWithRUC.LocalFunction--", CompilerGeneratedCode = true, ProducedBy = Tool.NativeAot)]
[ExpectedWarning ("IL3050", "--MethodWithLocalFunctionWithRUC.LocalFunction--", CompilerGeneratedCode = true, ProducedBy = Tool.NativeAot)]
[ExpectedWarning ("IL2118", nameof (TypeWithMethodWithRequires.MethodWithLocalFunctionCallsRUC), "LocalFunction", CompilerGeneratedCode = true,
ProducedBy = Tool.Trimmer | Tool.NativeAot)]
ProducedBy = Tool.Trimmer)]
[ExpectedWarning ("IL2111", nameof (TypeWithMethodWithRequires.MethodWithAnnotations), CompilerGeneratedCode = true)]
static async void TestAsync ()
{
Expand Down Expand Up @@ -97,7 +97,7 @@ static void TestLocalFunction ()
[ExpectedWarning ("IL3002", "--MethodWithLocalFunctionWithRUC.LocalFunction--", ProducedBy = Tool.NativeAot)]
[ExpectedWarning ("IL3050", "--MethodWithLocalFunctionWithRUC.LocalFunction--", ProducedBy = Tool.NativeAot)]
[ExpectedWarning ("IL2118", nameof (TypeWithMethodWithRequires.MethodWithLocalFunctionCallsRUC), "LocalFunction",
ProducedBy = Tool.Trimmer | Tool.NativeAot)]
ProducedBy = Tool.Trimmer)]
[ExpectedWarning ("IL2111", nameof (TypeWithMethodWithRequires.MethodWithAnnotations))]
void LocalFunction ()
{
Expand Down Expand Up @@ -156,7 +156,7 @@ static void TestLambda ()
[ExpectedWarning ("IL3002", "--MethodWithLocalFunctionWithRUC.LocalFunction--", ProducedBy = Tool.NativeAot)]
[ExpectedWarning ("IL3050", "--MethodWithLocalFunctionWithRUC.LocalFunction--", ProducedBy = Tool.NativeAot)]
[ExpectedWarning ("IL2118", nameof (TypeWithMethodWithRequires.MethodWithLocalFunctionCallsRUC), "LocalFunction",
ProducedBy = Tool.Trimmer | Tool.NativeAot)]
ProducedBy = Tool.Trimmer)]
[ExpectedWarning ("IL2111", nameof (TypeWithMethodWithRequires.MethodWithAnnotations))]
() => {
typeof (TypeWithMethodWithRequires).RequiresAll ();
Expand Down
6 changes: 3 additions & 3 deletions ...Linker.Tests.Cases/Warnings/WarningSuppression/SuppressWarningsInCompilerGeneratedCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ static void TestCallRUCMethodInLtftnLocalFunction ()

class DynamicallyAccessedLocalFunction
{
[ExpectedWarning ("IL2118", "LocalFunction", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
[ExpectedWarning ("IL2118", "LocalFunction", ProducedBy = Tool.Trimmer)]
[UnconditionalSuppressMessage ("Test", "IL2026")]
public static void TestCallRUCMethodInDynamicallyAccessedLocalFunction ()
{
Expand Down Expand Up @@ -426,7 +426,7 @@ static void TestGenericTypeParameterRequirement<TUnknown> ()

class DynamicallyAccessedLambda
{
[ExpectedWarning ("IL2118", nameof (TestCallRUCMethodInDynamicallyAccessedLambda), ProducedBy = Tool.Trimmer | Tool.NativeAot)]
[ExpectedWarning ("IL2118", nameof (TestCallRUCMethodInDynamicallyAccessedLambda), ProducedBy = Tool.Trimmer)]
[UnconditionalSuppressMessage ("Test", "IL2026")]
public static void TestCallRUCMethodInDynamicallyAccessedLambda ()
{
Expand All @@ -440,7 +440,7 @@ public static void TestCallRUCMethodInDynamicallyAccessedLambda ()

class DynamicallyAccessedLambdaUnused
{
[ExpectedWarning ("IL2118", nameof (TestCallRUCMethodInDynamicallyAccessedLambda), ProducedBy = Tool.Trimmer | Tool.NativeAot)]
[ExpectedWarning ("IL2118", nameof (TestCallRUCMethodInDynamicallyAccessedLambda), ProducedBy = Tool.Trimmer)]
[UnconditionalSuppressMessage ("Test", "IL2026")]
public static void TestCallRUCMethodInDynamicallyAccessedLambda ()
{
Expand Down