Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -409,7 +409,8 @@ internal ref TValue FindValue(TKey key)
if (typeof(TKey).IsValueType && // comparer can only be null for value types; enable JIT to eliminate entire if block for ref types
comparer == null)
{
uint hashCode = (uint)key.GetHashCode();
// TODO: Replace with just key.GetHashCode once https://github.com/dotnet/runtime/issues/117521 is resolved.
uint hashCode = (uint)EqualityComparer<TKey>.Default.GetHashCode(key);
int i = GetBucket(hashCode);
Entry[]? entries = _entries;
uint collisionCount = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ internal OrdinalIgnoreCaseComparer(IEqualityComparer<string?> wrappedComparer) :
{
}

public override bool Equals(string? x, string? y) => string.EqualsOrdinalIgnoreCase(x, y);
public override bool Equals(string? x, string? y) => string.Equals(x, y, StringComparison.OrdinalIgnoreCase);

public override int GetHashCode(string? obj)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ internal OrdinalIgnoreCaseComparer(IEqualityComparer<string?> wrappedComparer)
string IAlternateEqualityComparer<ReadOnlySpan<char>, string?>.Create(ReadOnlySpan<char> span) =>
span.ToString();

public override bool Equals(string? x, string? y) => string.EqualsOrdinalIgnoreCase(x, y);
public override bool Equals(string? x, string? y) => string.Equals(x, y, StringComparison.OrdinalIgnoreCase);

bool IAlternateEqualityComparer<ReadOnlySpan<char>, string?>.Equals(ReadOnlySpan<char> alternate, string? other)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,26 +46,6 @@ ref Unsafe.Add(ref strA.GetRawStringData(), (nint)(uint)indexA /* force zero-ext
ref Unsafe.Add(ref strB.GetRawStringData(), (nint)(uint)indexB /* force zero-extension */), countB);
}

internal static bool EqualsOrdinalIgnoreCase(string? strA, string? strB)
{
if (ReferenceEquals(strA, strB))
{
return true;
}

if (strA is null || strB is null)
{
return false;
}

if (strA.Length != strB.Length)
{
return false;
}

return EqualsOrdinalIgnoreCaseNoLengthCheck(strA, strB);
}

private static bool EqualsOrdinalIgnoreCaseNoLengthCheck(string strA, string strB)
{
Debug.Assert(strA.Length == strB.Length);
Expand Down
Loading