Skip to content

Get the normal event accessors generated #89441

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
Jul 25, 2023
Merged

Get the normal event accessors generated #89441

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
28 changes: 28 additions & 0 deletions src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MemberTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,15 @@ public void HideMethod () { }
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> PublicEventOnBase;
protected event EventHandler<EventArgs> ProtectedEventOnBase;
private event EventHandler<EventArgs> PrivateEventOnBase;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> HideEvent;

[Kept]
Expand Down Expand Up @@ -372,13 +374,15 @@ public void HideMethod () { }
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> PublicEvent;
protected event EventHandler<EventArgs> ProtectedEvent;
private event EventHandler<EventArgs> PrivateEvent;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> HideEvent;

[Kept]
Expand Down Expand Up @@ -440,6 +444,7 @@ public void HideMethod () { }
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
protected event EventHandler<EventArgs> ProtectedEventOnBase;
private event EventHandler<EventArgs> PrivateEventOnBase;
public event EventHandler<EventArgs> HideEvent;
Expand Down Expand Up @@ -496,11 +501,13 @@ public void HideMethod () { }
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
protected event EventHandler<EventArgs> ProtectedEvent;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
private event EventHandler<EventArgs> PrivateEvent;
public event EventHandler<EventArgs> HideEvent;

Expand Down Expand Up @@ -568,17 +575,20 @@ public void HideMethod () { }
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> PublicEventOnBase;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
protected event EventHandler<EventArgs> ProtectedEventOnBase;
private event EventHandler<EventArgs> PrivateEventOnBase;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> HideEvent;

[Kept]
Expand Down Expand Up @@ -651,21 +661,25 @@ public void HideMethod () { }
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> PublicEvent;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
protected event EventHandler<EventArgs> ProtectedEvent;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
private event EventHandler<EventArgs> PrivateEvent;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> HideEvent;

[Kept]
Expand Down Expand Up @@ -1377,13 +1391,15 @@ class PublicEventsBaseType
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> PublicEventOnBase;
protected event EventHandler<EventArgs> ProtectedEventOnBase;
private event EventHandler<EventArgs> PrivateEventOnBase;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> HideEvent;

[Kept]
Expand All @@ -1408,13 +1424,15 @@ class PublicEventsType : PublicEventsBaseType
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> PublicEvent;
protected event EventHandler<EventArgs> ProtectedEvent;
private event EventHandler<EventArgs> PrivateEvent;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> HideEvent;

[Kept]
Expand Down Expand Up @@ -1448,6 +1466,7 @@ class NonPublicEventsBaseType
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
protected event EventHandler<EventArgs> ProtectedEventOnBase;
private event EventHandler<EventArgs> PrivateEventOnBase;
public event EventHandler<EventArgs> HideEvent;
Expand All @@ -1471,11 +1490,13 @@ class NonPublicEventsType : NonPublicEventsBaseType
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
protected event EventHandler<EventArgs> ProtectedEvent;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
private event EventHandler<EventArgs> PrivateEvent;
public event EventHandler<EventArgs> HideEvent;

Expand Down Expand Up @@ -1508,17 +1529,20 @@ class AllEventsBaseType
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> PublicEventOnBase;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
protected event EventHandler<EventArgs> ProtectedEventOnBase;
private event EventHandler<EventArgs> PrivateEventOnBase;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> HideEvent;

[Kept]
Expand Down Expand Up @@ -1547,21 +1571,25 @@ class AllEventsType : AllEventsBaseType
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> PublicEvent;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectLocalsModified]
[method: ExpectBodyModified]
protected event EventHandler<EventArgs> ProtectedEvent;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
private event EventHandler<EventArgs> PrivateEvent;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> HideEvent;

[Kept]
Expand Down
2 changes: 2 additions & 0 deletions ...s/illink/test/Mono.Linker.Tests.Cases/DynamicDependencies/DynamicDependencyMemberTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ class TypeWithPublicEvent
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler PublicEvent;

event EventHandler NonPublicEvent;
Expand All @@ -224,6 +225,7 @@ class TypeWithNonPublicEvent
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
event EventHandler NonPublicEvent;

public event EventHandler PublicEven;
Expand Down
15 changes: 15 additions & 0 deletions src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/EventUsedViaReflection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ class Bar
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
private event EventHandler<EventArgs> PrivateEvent;
public event EventHandler<EventArgs> PublicEvent;
}
Expand All @@ -211,6 +212,7 @@ class UnknownBindingFlags
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
internal event EventHandler<EventArgs> InternalEvent;
[Kept]
[KeptBackingField]
Expand All @@ -221,11 +223,13 @@ class UnknownBindingFlags
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
private event EventHandler<EventArgs> PrivateEvent;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> PublicEvent;
}

Expand All @@ -235,6 +239,7 @@ class UnknownBindingFlagsAndName
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
internal event EventHandler<EventArgs> InternalEvent;
[Kept]
[KeptBackingField]
Expand All @@ -245,11 +250,13 @@ class UnknownBindingFlagsAndName
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
private event EventHandler<EventArgs> PrivateEvent;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> PublicEvent;
}

Expand All @@ -259,11 +266,13 @@ class IfClass
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> IfEvent;
[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> ElseEvent;
}

Expand All @@ -278,6 +287,7 @@ class ElseClass
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> IfEvent;
}

Expand All @@ -289,6 +299,7 @@ class BaseClass
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> PublicEventOnBase;
}
[KeptBaseType (typeof (BaseClass))]
Expand All @@ -302,12 +313,14 @@ class IgnoreCaseBindingFlagsClass
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> PublicEvent;

[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
private event EventHandler<EventArgs> MarkedDueToIgnoreCaseEvent;
}

Expand All @@ -324,12 +337,14 @@ class PutRefDispPropertyBindingFlagsClass
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> PublicEvent;

[Kept]
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
private event EventHandler<EventArgs> MarkedDueToPutRefDispPropertyEvent;
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/RuntimeReflectionExtensionsCalls.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ class ClassWithKeptMembers
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> PublicEvent;

[Kept]
Expand Down Expand Up @@ -195,6 +196,7 @@ class Base
[KeptEventAddMethod]
[KeptEventRemoveMethod]
[method: ExpectBodyModified]
[method: ExpectLocalsModified]
public event EventHandler<EventArgs> Event;

[Kept]
Expand Down
1 change: 1 addition & 0 deletions ...ools/illink/test/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD
yield return Path.Combine (referenceDir, "System.Runtime.dll");
yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
yield return Path.Combine (referenceDir, "System.Runtime.InteropServices.dll");
yield return Path.Combine (referenceDir, "System.Threading.dll");
} else {
yield return "mscorlib.dll";
}
Expand Down