Skip to content

Allow new() constraint to satisfy DynamicallyAccessedMemberTypes.PublicParameterlessConstructor #1414

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
merged 2 commits into from
Aug 10, 2020
Merged

Allow new() constraint to satisfy DynamicallyAccessedMemberTypes.PublicParameterlessConstructor #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fb0f51
Allow new() constraint to satisfy DynamicallyAccessedMemberTypes.Publ…
MichalStrehovsky Aug 5, 2020
444e86a
afsddlhjksdf
MichalStrehovsky Aug 10, 2020
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
7 changes: 6 additions & 1 deletion src/linker/Linker.Dataflow/ReflectionMethodBodyScanner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,12 @@ void ProcessCreateInstanceByName (ref ReflectionPatternContext reflectionContext
void RequireDynamicallyAccessedMembers (ref ReflectionPatternContext reflectionContext, DynamicallyAccessedMemberTypes requiredMemberTypes, ValueNode value, IMetadataTokenProvider targetContext)
{
foreach (var uniqueValue in value.UniqueValues ()) {
if (uniqueValue is LeafValueWithDynamicallyAccessedMemberNode valueWithDynamicallyAccessedMember) {
if (requiredMemberTypes == DynamicallyAccessedMemberTypes.PublicParameterlessConstructor
&& uniqueValue is SystemTypeForGenericParameterValue genericParam
&& genericParam.GenericParameter.HasDefaultConstructorConstraint) {
// We allow a new() constraint on a generic parameter to satisfy DynamicallyAccessedMemberTypes.PublicParameterlessConstructor
reflectionContext.RecordHandledPattern ();
} else if (uniqueValue is LeafValueWithDynamicallyAccessedMemberNode valueWithDynamicallyAccessedMember) {
if (!valueWithDynamicallyAccessedMember.DynamicallyAccessedMemberTypes.HasFlag (requiredMemberTypes)) {
reflectionContext.RecordUnrecognizedPattern ($"The {GetValueDescriptionForErrorMessage (valueWithDynamicallyAccessedMember)} " +
$"with dynamically accessed member kinds '{DiagnosticUtilities.GetDynamicallyAccessedMemberTypesDescription (valueWithDynamicallyAccessedMember.DynamicallyAccessedMemberTypes)}' " +
Expand Down
12 changes: 12 additions & 0 deletions test/Mono.Linker.Tests.Cases/DataFlow/GenericParameterDataFlow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public static void Main ()

TestMakeGenericType ();
TestMakeGenericMethod ();

TestNewConstraintSatisfiesParameterlessConstructor<object> ();
}

static void TestSingleGenericParameterOnType ()
Expand Down Expand Up @@ -788,5 +790,15 @@ static void MethodMakeGenericWithNoRequirements<T> ()
public class TestType
{
}

[RecognizedReflectionAccessPattern]
static void TestNewConstraintSatisfiesParameterlessConstructor<T> () where T : new()
{
RequiresParameterlessConstructor<T> ();
}

static void RequiresParameterlessConstructor<[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] T> ()
{
}
}
}