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.

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

Fix EventSource trimmer warning #51237

Merged
merged 63 commits into from
Apr 20, 2021
Merged
Show file tree
Hide file tree
Changes from 61 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
54516c7
eh fix
LakshanF Oct 29, 2020
dbe9ca4
Merge remote-tracking branch 'upstream/master'
LakshanF Oct 29, 2020
70e04d7
Merge remote-tracking branch 'upstream/master'
LakshanF Jan 1, 2021
f4fc3f8
Merge remote-tracking branch 'upstream/master'
LakshanF Jan 6, 2021
ee6401d
Merge remote-tracking branch 'upstream/master'
LakshanF Jan 7, 2021
e87f26c
Merge remote-tracking branch 'upstream/master'
LakshanF Feb 9, 2021
af6bcb0
Merge remote-tracking branch 'upstream/master'
LakshanF Feb 10, 2021
9cc84c0
Merge remote-tracking branch 'upstream/master'
LakshanF Feb 10, 2021
2f7bc29
Merge remote-tracking branch 'upstream/master'
LakshanF Feb 11, 2021
42eadd3
test change that inadvertently got checked in earlier
LakshanF Feb 11, 2021
d4d9e31
Merge remote-tracking branch 'upstream/master'
LakshanF Feb 12, 2021
7317d3c
Merge remote-tracking branch 'upstream/master'
LakshanF Feb 17, 2021
f04fb8d
Merge remote-tracking branch 'upstream/master'
LakshanF Feb 22, 2021
3427371
Merge remote-tracking branch 'upstream/master'
LakshanF Feb 23, 2021
5cf8134
Merge branch 'master' of https://github.com/LakshanF/runtime
LakshanF Feb 23, 2021
584e0e3
Merge remote-tracking branch 'upstream/master'
LakshanF Feb 24, 2021
715dcbd
Merge branch 'master' of https://github.com/LakshanF/runtime
LakshanF Feb 24, 2021
8dab23e
Merge remote-tracking branch 'upstream/master'
LakshanF Feb 25, 2021
56fcb12
Merge branch 'master' of https://github.com/LakshanF/runtime
LakshanF Feb 25, 2021
7679b91
Merge remote-tracking branch 'upstream/master'
LakshanF Feb 26, 2021
1fdfdbf
Merge remote-tracking branch 'upstream/master'
LakshanF Feb 26, 2021
f50c6f9
Merge branch 'master' of https://github.com/LakshanF/runtime
LakshanF Feb 26, 2021
db9be82
Suppresses the trimmer warning on TypeAnalysis ctor
LakshanF Feb 26, 2021
b623513
Incorporating FB
LakshanF Feb 26, 2021
045e38d
Update src/libraries/System.Diagnostics.DiagnosticSource/src/System/D…
LakshanF Mar 1, 2021
a9dda65
Update src/libraries/System.Diagnostics.DiagnosticSource/src/System/D…
LakshanF Mar 1, 2021
4ccd2ae
Update src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tr…
LakshanF Mar 1, 2021
ea460c3
Fix DynamicDependency as per PR feedback
LakshanF Mar 1, 2021
31667cf
Merge branch 'EventSrcWrnFix2' of https://github.com/LakshanF/runtime…
LakshanF Mar 1, 2021
3e56d85
an earlier change got reverted
LakshanF Mar 1, 2021
aa2a21d
fixed proj file netcore app condition check
LakshanF Mar 1, 2021
3d61a44
fixed NETCORE_ENGINEERING_TELEMETRY build failures
LakshanF Mar 1, 2021
5775e1a
fixeing another NETCORE_ENGINEERING_TELEMETRY build failures
LakshanF Mar 1, 2021
f1d3a1b
Adding RequiresUnreferencedCode to TypeAnalysis ctor instead of suppr…
LakshanF Mar 2, 2021
589ee3f
PR FB and suppressing warnings for safe calls
LakshanF Mar 3, 2021
bb4a18d
propagated the warning all the way up
LakshanF Mar 3, 2021
024c8d6
CI build break fix for one file
LakshanF Mar 3, 2021
7dd337f
Merge branch 'main' into EventSrcWrnFix2
LakshanF Mar 4, 2021
6d51f12
excluding NativeRTEventSrc from being build in a project
LakshanF Mar 4, 2021
bfd3bc3
Merge branch 'EventSrcWrnFix2' of https://github.com/LakshanF/runtime…
LakshanF Mar 4, 2021
0540809
Missed couple of supppressions on NativeRTEventSrc
LakshanF Mar 4, 2021
f0ca444
build break fixes
LakshanF Mar 4, 2021
a3808fe
Merge remote-tracking branch 'upstream/main' into main
LakshanF Mar 9, 2021
ca38974
Merge remote-tracking branch 'upstream/main' into main
LakshanF Mar 9, 2021
bcc0670
Merge remote-tracking branch 'upstream/main' into main
LakshanF Mar 17, 2021
bcde531
Merge remote-tracking branch 'upstream/main' into main
LakshanF Mar 23, 2021
d09d490
Merge remote-tracking branch 'upstream/main' into main
LakshanF Mar 26, 2021
30be374
Merge remote-tracking branch 'upstream/main' into main
LakshanF Apr 6, 2021
6bd2eab
Merge branch 'main' of https://github.com/LakshanF/runtime into main
LakshanF Apr 6, 2021
ae2a13a
Merge remote-tracking branch 'upstream/main' into main
LakshanF Apr 9, 2021
376e596
Merge remote-tracking branch 'upstream/main' into main
LakshanF Apr 9, 2021
8bfe839
Merge branch 'main' of https://github.com/LakshanF/runtime into main
LakshanF Apr 9, 2021
d438923
Merge remote-tracking branch 'upstream/main' into main
LakshanF Apr 12, 2021
9525a71
Merge remote-tracking branch 'upstream/main' into main
LakshanF Apr 13, 2021
f6c6cfe
Merge remote-tracking branch 'upstream/main' into main
LakshanF Apr 13, 2021
b79705e
Merge remote-tracking branch 'upstream/main' into main
LakshanF Apr 13, 2021
a91e900
Trimmer warning fix related to EventSource manifest creation
LakshanF Apr 14, 2021
86ce794
incorporate fb
LakshanF Apr 14, 2021
2fd2f6f
fix build break in some configs
LakshanF Apr 15, 2021
b9d9622
Merge branch 'main' of https://github.com/dotnet/runtime into EventSr…
LakshanF Apr 19, 2021
505d553
Merge branch 'main' of https://github.com/dotnet/runtime into EventSr…
LakshanF Apr 19, 2021
a87e452
comment feedback
LakshanF Apr 19, 2021
1790705
build break
LakshanF Apr 19, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ public enum EventOpcode
Send = 9,
Receive = 240,
}
[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need All - is that because of the NestedTypes issue?
(we should fix that then - it's been agreed that we should change the behavior of that already).

public partial class EventSource : System.IDisposable
{
protected EventSource() { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@
<property name="Scope">member</property>
<property name="Target">M:Internal.Runtime.InteropServices.ComponentActivator.InternalGetFunctionPointer(System.Runtime.Loader.AssemblyLoadContext,System.String,System.String,System.IntPtr)</property>
</attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
LakshanF marked this conversation as resolved.
Show resolved Hide resolved
<argument>ILLink</argument>
<argument>IL2072</argument>
<property name="Scope">member</property>
<property name="Target">M:System.Diagnostics.Tracing.EventSource.EnsureDescriptorsInitialized</property>
</attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2075</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@ internal sealed class EventSourceAutoGenerateAttribute : Attribute
/// }
/// </code>
/// </remarks>
#if !ES_BUILD_STANDALONE
[DynamicallyAccessedMembers(ManifestMemberTypes)]
LakshanF marked this conversation as resolved.
Show resolved Hide resolved
#endif
public partial class EventSource : IDisposable
{

Expand Down Expand Up @@ -2765,7 +2768,16 @@ private void EnsureDescriptorsInitialized()
{
// get the metadata via reflection.
Debug.Assert(m_rawManifest == null);
#if !ES_BUILD_STANDALONE
[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode",
eerhardt marked this conversation as resolved.
Show resolved Hide resolved
Justification = "Based on the annotation on EventSource class, Trimmer will see from its analysis members " +
"that are marked with RequiresUnreferencedCode and will warn." +
"This method will not access any of these members and is safe to call.")]
byte[]? GetCreateManifestAndDescriptorsViaLocalMethod(string name) => CreateManifestAndDescriptors(this.GetType(), name, this);
m_rawManifest = GetCreateManifestAndDescriptorsViaLocalMethod(Name);
#else
m_rawManifest = CreateManifestAndDescriptors(this.GetType(), Name, this);
#endif
Debug.Assert(m_eventData != null);

// TODO Enforce singleton pattern
Expand Down