Skip to content

Delete useless delegate virtual methods #97959

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 6 commits into from
Feb 7, 2024
Merged

Delete useless delegate virtual methods #97959

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e55812f
Delete useless delegate virtual methods
MichalStrehovsky Feb 5, 2024
ce430d5
Apply suggestions from code review
jkotas Feb 5, 2024
ba07eed
FB
MichalStrehovsky Feb 5, 2024
900add5
FB
MichalStrehovsky Feb 6, 2024
3e281d0
Duh
MichalStrehovsky Feb 6, 2024
bf859d6
FB
MichalStrehovsky Feb 6, 2024
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
45 changes: 1 addition & 44 deletions src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,14 @@ namespace System
{
[ClassInterface(ClassInterfaceType.None)]
[ComVisible(true)]
public abstract class MulticastDelegate : Delegate
public abstract partial class MulticastDelegate : Delegate
{
// This is set under 2 circumstances
// 1. Multicast delegate
// 2. Wrapper delegate
private object? _invocationList; // Initialized by VM as needed
private nint _invocationCount;

// This constructor is called from the class generated by the
// compiler generated code (This must match the constructor
// in Delegate
[RequiresUnreferencedCode("The target method might be removed")]
protected MulticastDelegate(object target, string method) : base(target, method)
{
}

// This constructor is called from a class to generate a
// delegate based upon a static method name and the Type object
// for the class defining the method.
protected MulticastDelegate([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type target, string method) : base(target, method)
{
}

internal bool IsUnmanagedFunctionPtr()
{
return _invocationCount == -1;
Expand Down Expand Up @@ -448,34 +433,6 @@ public sealed override Delegate[] GetInvocationList()
}
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool operator ==(MulticastDelegate? d1, MulticastDelegate? d2)
{
// Test d2 first to allow branch elimination when inlined for null checks (== null)
// so it can become a simple test
if (d2 is null)
{
return d1 is null;
}

return ReferenceEquals(d2, d1) ? true : d2.Equals((object?)d1);
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool operator !=(MulticastDelegate? d1, MulticastDelegate? d2)
{
// Can't call the == operator as it will call object==

// Test d2 first to allow branch elimination when inlined for not null checks (!= null)
// so it can become a simple test
if (d2 is null)
{
return d1 is not null;
}

return ReferenceEquals(d2, d1) ? false : !d2.Equals(d1);
}

public sealed override int GetHashCode()
{
if (IsUnmanagedFunctionPtr())
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@
<Compile Include="System\GC.NativeAot.cs" />
<Compile Include="System\Math.NativeAot.cs" />
<Compile Include="System\MathF.NativeAot.cs" />
<Compile Include="System\MulticastDelegate.cs" />
<Compile Include="System\Object.NativeAot.cs" />
<Compile Include="System\Resources\ManifestBasedResourceGroveler.NativeAot.cs" />
<Compile Include="System\RuntimeArgumentHandle.cs" />
Expand Down
Loading