Skip to content

Support for RequiresAttributeMismatch testing #72496

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
tlakollo merged 5 commits into from
Jul 21, 2022
Merged

Support for RequiresAttributeMismatch testing #72496

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe20630
Default answer of ShouldProduceFullVTable to false in the MultiFileSh…
tlakollo Jul 19, 2022
0f4bb88
PR feedback
tlakollo Jul 21, 2022
d34d8cb
Gate warning generation of IL2026 to cases in which TypeHierarchy doe…
tlakollo Jul 21, 2022
8d4a5eb
Refactor code for better readability
tlakollo Jul 21, 2022
1407ccb
Move TestInfraMultiFileCompilationModuleGroup to test project
tlakollo Jul 21, 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
Refactor code for better readability
  • Loading branch information
@tlakollo
tlakollo committed Jul 21, 2022
commit 8d4a5eb5dfc7a63c9eee9e2b9267f5895b40486a
27 changes: 12 additions & 15 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/ReflectionMarker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,23 +204,20 @@ void CheckAndWarnOnReflectionAccess(in MessageOrigin origin, TypeSystemEntity en
MessageFormat.FormatRequiresAttributeMessageArg(DiagnosticUtilities.GetRequiresAttributeMessage(requiresAttribute.Value)),
MessageFormat.FormatRequiresAttributeUrlArg(DiagnosticUtilities.GetRequiresAttributeUrl(requiresAttribute.Value)));
}
}

if (entity.DoesMemberRequire(DiagnosticUtilities.RequiresUnreferencedCodeAttribute, out requiresAttribute) &&
!_logger.ShouldSuppressAnalysisWarningsForRequires(origin.MemberDefinition, DiagnosticUtilities.RequiresUnreferencedCodeAttribute) &&
!_typeHierarchyDataFlow)
{
var diagnosticContext = new DiagnosticContext(
origin,
_logger.ShouldSuppressAnalysisWarningsForRequires(origin.MemberDefinition, DiagnosticUtilities.RequiresUnreferencedCodeAttribute),
_logger.ShouldSuppressAnalysisWarningsForRequires(origin.MemberDefinition, DiagnosticUtilities.RequiresDynamicCodeAttribute),
_logger.ShouldSuppressAnalysisWarningsForRequires(origin.MemberDefinition, DiagnosticUtilities.RequiresAssemblyFilesAttribute),
_logger);
else
{
var diagnosticContext = new DiagnosticContext(
origin,
_logger.ShouldSuppressAnalysisWarningsForRequires(origin.MemberDefinition, DiagnosticUtilities.RequiresUnreferencedCodeAttribute),
_logger.ShouldSuppressAnalysisWarningsForRequires(origin.MemberDefinition, DiagnosticUtilities.RequiresDynamicCodeAttribute),
_logger.ShouldSuppressAnalysisWarningsForRequires(origin.MemberDefinition, DiagnosticUtilities.RequiresAssemblyFilesAttribute),
_logger);

string arg1 = MessageFormat.FormatRequiresAttributeMessageArg(DiagnosticUtilities.GetRequiresAttributeMessage(requiresAttribute.Value));
string arg2 = MessageFormat.FormatRequiresAttributeUrlArg(DiagnosticUtilities.GetRequiresAttributeUrl(requiresAttribute.Value));
string arg1 = MessageFormat.FormatRequiresAttributeMessageArg(DiagnosticUtilities.GetRequiresAttributeMessage(requiresAttribute.Value));
string arg2 = MessageFormat.FormatRequiresAttributeUrlArg(DiagnosticUtilities.GetRequiresAttributeUrl(requiresAttribute.Value));

diagnosticContext.AddDiagnostic(DiagnosticId.RequiresUnreferencedCode, entity.GetDisplayName(), arg1, arg2);
diagnosticContext.AddDiagnostic(DiagnosticId.RequiresUnreferencedCode, entity.GetDisplayName(), arg1, arg2);
}
}

if (!Annotations.ShouldWarnWhenAccessedForReflection(entity))
Expand Down
9 changes: 6 additions & 3 deletions src/coreclr/tools/aot/Mono.Linker.Tests/Extensions/CecilExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,7 @@ public static string GetDisplayName (this MethodReference method)
var methodDefinition = method.Resolve ();
if (methodDefinition != null && (methodDefinition.IsSetter || methodDefinition.IsGetter)) {
// Append property name
string name = methodDefinition.IsSetter ?
string.Concat (methodDefinition.Name.StartsWith ("set_") ? methodDefinition.Name.AsSpan (4) : methodDefinition.Name.Replace (".set_", "."), ".set") :
string.Concat (methodDefinition.Name.StartsWith ("get_") ? methodDefinition.Name.AsSpan (4) : methodDefinition.Name.Replace (".get_", "."), ".get");
string name = GetPropertyNameFromAccessorName (methodDefinition.Name, methodDefinition.IsSetter);
sb.Append (name);
// Insert declaring type name and namespace
sb.Insert (0, '.').Insert (0, method.DeclaringType?.GetDisplayName ());
Expand Down Expand Up @@ -230,6 +228,11 @@ public static string GetDisplayName (this MethodReference method)
return sb.ToString ();
}

private static string GetPropertyNameFromAccessorName (string methodName, bool isSetter) =>
isSetter ?
string.Concat (methodName.StartsWith ("set_") ? methodName.AsSpan (4) : methodName.Replace (".set_", "."), ".set") :
string.Concat (methodName.StartsWith ("get_") ? methodName.AsSpan (4) : methodName.Replace (".get_", "."), ".get");

public static string GetDisplayName (this TypeReference type)
{
var builder = GetDisplayNameWithoutNamespace (type);
Expand Down