Skip to content

Commit

Permalink
Avoid unnecessary lazy init in StructuralComparisons (#101344)
Browse files Browse the repository at this point in the history
* Avoid unnecessary lazy init in StructuralComparisons

Move the fields to the target types and make them readonly instead of manually lazy.

* Update StructuralComparisons.cs
  • Loading branch information
stephentoub authored Apr 21, 2024
1 parent a3dc133 commit 4aeb952
Showing 1 changed file with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ namespace System.Collections
{
public static class StructuralComparisons
{
private static volatile IComparer? s_StructuralComparer;
private static volatile IEqualityComparer? s_StructuralEqualityComparer;
public static IComparer StructuralComparer => System.Collections.StructuralComparer.s_instance;

public static IComparer StructuralComparer => s_StructuralComparer ??= new StructuralComparer();

public static IEqualityComparer StructuralEqualityComparer => s_StructuralEqualityComparer ??= new StructuralEqualityComparer();
public static IEqualityComparer StructuralEqualityComparer => System.Collections.StructuralEqualityComparer.s_instance;
}

internal sealed class StructuralEqualityComparer : IEqualityComparer
{
internal static readonly StructuralEqualityComparer s_instance = new();

public new bool Equals(object? x, object? y)
{
if (x != null)
Expand Down Expand Up @@ -58,6 +57,8 @@ public int GetHashCode(object obj)

internal sealed class StructuralComparer : IComparer
{
internal static readonly StructuralComparer s_instance = new();

public int Compare(object? x, object? y)
{
if (x == null) return y == null ? 0 : -1;
Expand Down

0 comments on commit 4aeb952

Please sign in to comment.