Skip to content

Suppress warning in instance fields #2973

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 1 commit into from
Aug 15, 2022
Merged

Suppress warning in instance fields #2973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions src/ILLink.RoslynAnalyzer/RequiresISymbolExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,15 @@ private static bool IsInRequiresScope (this ISymbol member, string requiresAttri
if (checkAssociatedSymbol && member is IMethodSymbol { AssociatedSymbol: { } associated } && associated.HasAttribute (requiresAttribute))
return true;

// When using instance fields suppress the warning if the constructor has already the Requires annotation
if (member is IFieldSymbol field && !field.IsStatic) {
foreach (var constructor in field.ContainingType.InstanceConstructors) {
if (!constructor.HasAttribute (requiresAttribute))
return false;
}
return true;
}

return false;
}
}
Expand Down
17 changes: 17 additions & 0 deletions test/Mono.Linker.Tests.Cases/RequiresCapability/RequiresOnClass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public static void Main ()
TestRequiresOnBaseButNotOnDerived ();
TestRequiresOnDerivedButNotOnBase ();
TestRequiresOnBaseAndDerived ();
TestInstanceFieldSuppression ();
TestSuppressionsOnClass ();
TestStaticMethodOnRequiresTypeSuppressedByRequiresOnMethod ();
TestStaticConstructorCalls ();
Expand Down Expand Up @@ -246,6 +247,22 @@ static void TestInstanceFieldCallDontWarn ()
var _ = instance.field;
}

public class ClassWithInstanceFieldWhichInitsDangerousClass
{
private ClassWithRequires _instanceField = new ClassWithRequires ();

[RequiresUnreferencedCode ("Calling the constructor is dangerous")]
[RequiresDynamicCode ("Calling the constructor is dangerous")]
public ClassWithInstanceFieldWhichInitsDangerousClass () { }
}

[ExpectedWarning ("IL2026", "Calling the constructor is dangerous")]
[ExpectedWarning ("IL3050", "Calling the constructor is dangerous", ProducedBy = ProducedBy.Analyzer)]
static void TestInstanceFieldSuppression ()
{
_ = new ClassWithInstanceFieldWhichInitsDangerousClass ();
}

[RequiresUnreferencedCode ("Message for --StaticCtorTriggeredByMethodCall2--")]
[RequiresDynamicCode ("Message for --StaticCtorTriggeredByMethodCall2--")]
class StaticCtorTriggeredByMethodCall2
Expand Down