Skip to content

Optimize index bounds check for immutable sorted set and list #53266

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
stephentoub merged 4 commits into from
Jul 9, 2021
Merged

Optimize index bounds check for immutable sorted set and list #53266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa983ab
Optimize index bounds check for immutable sorted set and list
L2 May 26, 2021
ecfafac
Remove redundant code
L2 May 26, 2021
d6c873b
Remove redundant assert
L2 May 26, 2021
e7ea9a0
Apply suggestions from code review
L2 May 28, 2021
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
9 changes: 7 additions & 2 deletions ...ies/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableList_1.Node.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,20 @@ internal ref readonly T ItemRef(int index)
{
Requires.Range(index >= 0 && index < this.Count, nameof(index));

return ref ItemRefUnchecked(index);
}

private ref readonly T ItemRefUnchecked(int index)
{
Debug.Assert(_left != null && _right != null);
if (index < _left._count)
{
return ref _left.ItemRef(index);
return ref _left.ItemRefUnchecked(index);
}

if (index > _left._count)
{
return ref _right.ItemRef(index - _left._count - 1);
return ref _right.ItemRefUnchecked(index - _left._count - 1);
}

return ref _key;
Expand Down
10 changes: 8 additions & 2 deletions ...ystem.Collections.Immutable/src/System/Collections/Immutable/ImmutableSortedSet_1.Node.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,16 +261,22 @@ internal T this[int index]
internal ref readonly T ItemRef(int index)
{
Requires.Range(index >= 0 && index < this.Count, nameof(index));

return ref ItemRefUnchecked(index);
}

private ref readonly T ItemRefUnchecked(int index)
{
Debug.Assert(_left != null && _right != null);

if (index < _left._count)
{
return ref _left.ItemRef(index);
return ref _left.ItemRefUnchecked(index);
}

if (index > _left._count)
{
return ref _right.ItemRef(index - _left._count - 1);
return ref _right.ItemRefUnchecked(index - _left._count - 1);
}

return ref _key;
Expand Down