Skip to content

Avoid boxing in FrugalList #4724

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
Aug 17, 2021
Merged

Avoid boxing in FrugalList #4724

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
46 changes: 23 additions & 23 deletions src/Microsoft.DotNet.Wpf/src/Shared/MS/Utility/FrugalList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,12 +265,12 @@ public override void Clear()

public override bool Contains(T value)
{
return _loneEntry.Equals(value);
return EqualityComparer<T>.Default.Equals(_loneEntry, value);
}

public override int IndexOf(T value)
{
if (_loneEntry.Equals(value))
if (EqualityComparer<T>.Default.Equals(_loneEntry, value))
{
return 0;
}
Expand Down Expand Up @@ -298,7 +298,7 @@ public override void SetAt(int index, T value)
public override bool Remove(T value)
{
// Wipe out the info in the only entry if it matches the item.
if (_loneEntry.Equals(value))
if (EqualityComparer<T>.Default.Equals(_loneEntry, value))
{
_loneEntry = default(T);
--_count;
Expand Down Expand Up @@ -440,17 +440,17 @@ public override bool Contains(T value)

public override int IndexOf(T value)
{
if (_entry0.Equals(value))
if (EqualityComparer<T>.Default.Equals(_entry0, value))
{
return 0;
}
if (_count > 1)
{
if (_entry1.Equals(value))
if (EqualityComparer<T>.Default.Equals(_entry1, value))
{
return 1;
}
if ((3 == _count) && (_entry2.Equals(value)))
if ((3 == _count) && EqualityComparer<T>.Default.Equals(_entry2, value))
{
return 2;
}
Expand Down Expand Up @@ -516,19 +516,19 @@ public override bool Remove(T value)
// If the item matches an existing entry, wipe out the last
// entry and move all the other entries up. Because we only
// have three entries we can just unravel all the cases.
if (_entry0.Equals(value))
if (EqualityComparer<T>.Default.Equals(_entry0, value))
{
RemoveAt(0);
return true;
}
else if ( _count > 1)
{
if (_entry1.Equals(value))
if (EqualityComparer<T>.Default.Equals(_entry1, value))
{
RemoveAt(1);
return true;
}
else if ((3 == _count) && (_entry2.Equals(value)))
else if ((3 == _count) && EqualityComparer<T>.Default.Equals(_entry2, value))
{
RemoveAt(2);
return true;
Expand Down Expand Up @@ -781,35 +781,35 @@ public override bool Contains(T value)

public override int IndexOf(T value)
{
if (_entry0.Equals(value))
if (EqualityComparer<T>.Default.Equals(_entry0, value))
{
return 0;
}
if (_count > 1)
{
if (_entry1.Equals(value))
if (EqualityComparer<T>.Default.Equals(_entry1, value))
{
return 1;
}
if (_count > 2)
{
if (_entry2.Equals(value))
if (EqualityComparer<T>.Default.Equals(_entry2, value))
{
return 2;
}
if (_count > 3)
{
if (_entry3.Equals(value))
if (EqualityComparer<T>.Default.Equals(_entry3, value))
{
return 3;
}
if (_count > 4)
{
if (_entry4.Equals(value))
if (EqualityComparer<T>.Default.Equals(_entry4, value))
{
return 4;
}
if ((6 == _count) && (_entry5.Equals(value)))
if ((6 == _count) && EqualityComparer<T>.Default.Equals(_entry5, value))
{
return 5;
}
Expand Down Expand Up @@ -914,40 +914,40 @@ public override bool Remove(T value)
// If the item matches an existing entry, wipe out the last
// entry and move all the other entries up. Because we only
// have six entries we can just unravel all the cases.
if (_entry0.Equals(value))
if (EqualityComparer<T>.Default.Equals(_entry0, value))
{
RemoveAt(0);
return true;
}
else if (_count > 1)
{
if (_entry1.Equals(value))
if (EqualityComparer<T>.Default.Equals(_entry1, value))
{
RemoveAt(1);
return true;
}
else if (_count > 2)
{
if (_entry2.Equals(value))
if (EqualityComparer<T>.Default.Equals(_entry2, value))
{
RemoveAt(2);
return true;
}
else if (_count > 3)
{
if (_entry3.Equals(value))
if (EqualityComparer<T>.Default.Equals(_entry3, value))
{
RemoveAt(3);
return true;
}
else if (_count > 4)
{
if (_entry4.Equals(value))
if (EqualityComparer<T>.Default.Equals(_entry4, value))
{
RemoveAt(4);
return true;
}
else if ((6 == _count) && (_entry5.Equals(value)))
else if ((6 == _count) && EqualityComparer<T>.Default.Equals(_entry5, value))
{
RemoveAt(5);
return true;
Expand Down Expand Up @@ -1392,7 +1392,7 @@ public override int IndexOf(T value)
{
for (int index = 0; index < _count; ++index)
{
if (_entries[index].Equals(value))
if (EqualityComparer<T>.Default.Equals(_entries[index], value))
{
return index;
}
Expand Down Expand Up @@ -1425,7 +1425,7 @@ public override bool Remove(T value)
{
for (int index = 0; index < _count; ++index)
{
if (_entries[index].Equals(value))
if (EqualityComparer<T>.Default.Equals(_entries[index], value))
{
RemoveAt(index);
return true;
Expand Down