Skip to content
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

Address remaining Ref.Emit ILLink warnings in Mono. #45723

Merged
merged 3 commits into from
Dec 8, 2020
Merged

Address remaining Ref.Emit ILLink warnings in Mono. #45723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13f9933
Address remaining Ref.Emit warnings in Mono.
eerhardt Dec 7, 2020
53086b3
Remove mono suppressions file from illink-sharedframework.targets
eerhardt Dec 7, 2020
c395d9f
Fix typeo.
eerhardt Dec 7, 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
1 change: 0 additions & 1 deletion src/libraries/illink-sharedframework.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
<!-- Collate CoreLib suppression XML files not bin-placed in earlier per-library linker run. CoreLib doesn't use bin-place logic. -->
<_SuppressionsXmls Include="$(CoreLibSharedILLinkSuppressionsFilesPrefix).xml" />
<_SuppressionsXmls Condition="'$(TargetOS)' != 'windows'" Include="$(CoreLibSharedILLinkSuppressionsFilesPrefix).NonWindows.xml" />
<_SuppressionsXmls Condition="'$(RuntimeFlavor)' == 'Mono'" Include="$(MonoProjectRoot)netcore\System.Private.CoreLib\$(ProjectILLinkSuppressionsFile).xml" />

<!-- netstandard2.1-only System.ComponentModel.Annotations XML file is not bin-placed during -allConfigurations builds
due to the linker not being run on the assembly (eng\illink.targets). Manually include it. -->
Expand Down
17 changes: 0 additions & 17 deletions src/mono/netcore/System.Private.CoreLib/src/ILLink/ILLink.Suppressions.xml
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions ...mono/netcore/System.Private.CoreLib/src/System/Reflection/Emit/MethodOnTypeBuilderInst.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ private static MethodInfo ExtractBaseMethod(MethodInfo info)
}

// Called from the runtime to return the corresponding finished MethodInfo object
[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2060:MakeGenericMethod",
Justification = "MethodOnTypeBuilderInst is Reflection.Emit's underlying implementation of MakeGenericMethod. " +
"Callers of the outer calls to MakeGenericMethod will be warned as appropriate.")]
internal MethodInfo RuntimeResolve()
{
Type type = instantiation.InternalResolve();
Expand Down
6 changes: 4 additions & 2 deletions src/mono/netcore/System.Private.CoreLib/src/System/Reflection/Emit/TypeBuilder.Mono.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,6 +910,8 @@ private bool has_ctor_method()
return this;
}

[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2074:UnrecognizedReflectionPattern",
Justification = "Linker doesn't analyze ResolveUserType but it's an identity function")]
private void ResolveUserTypes()
{
parent = ResolveUserType(parent);
Expand Down Expand Up @@ -1054,7 +1056,7 @@ public override Type GetElementType()
/* Needed to keep signature compatibility with MS.NET */
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicEvents)]
[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2085:UnrecognizedReflectionPattern",
Justification = "Linker doesn't recongnize GetEvents(BindingFlags.Public) but this is what the body is doing")]
Justification = "Linker doesn't recognize GetEvents(BindingFlags.Public) but this is what the body is doing")]
public override EventInfo[] GetEvents()
{
const BindingFlags DefaultBindingFlags = BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance;
Expand Down Expand Up @@ -1615,7 +1617,7 @@ public FieldBuilder DefineUninitializedData(string name, int size, FieldAttribut
public override int MetadataToken => 0x02000000 | table_idx;

[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2074:UnrecognizedReflectionPattern",
Justification = "Linker doesn't recongnize ResolveUserType")]
Justification = "Linker doesn't analyze ResolveUserType but it's an identity function")]
public void SetParent([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? parent)
{
check_not_created();
Expand Down