Skip to content

Improve PooledArrayBuilder<T>.ToArray() and ToArrayAndClear() #12217

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
Sep 11, 2025
Merged

Improve PooledArrayBuilder<T>.ToArray() and ToArrayAndClear() #12217

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
23 changes: 2 additions & 21 deletions src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/PooledArrayBuilder`1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,29 +670,10 @@ private readonly ImmutableArray<T> InlineItemsToImmutableArray()
}

public readonly T[] ToArray()
{
if (TryGetBuilder(out var builder))
{
return builder.ToArray();
}

return _inlineCount switch
{
0 => [],
1 => [_element0],
2 => [_element0, _element1],
3 => [_element0, _element1, _element2],
_ => [_element0, _element1, _element2, _element3]
};
}
=> ImmutableCollectionsMarshal.AsArray(ToImmutable()).AssumeNotNull();
Copy link
Contributor

@ToddGrun ToddGrun Sep 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

=> ImmutableCollectionsMarshal.AsArray(ToImmutable()).AssumeNotNull();

Curious why you didn't keep the ToArray* impls and change the ToImmutable* impls to use those instead.

Copy link
Member Author

@DustinCampbell DustinCampbell Sep 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's simpler this way. ImmutableArray<T>.Builder.DrainToImmutable() returns an ImmutableArray<T> -- there's no DrainToArray(). So, we'd have to unwrap the result in ToArray() and then the ToImmutable() methods would need to re-wrap the array. Seems more awkward that way.

Copy link
Contributor

@ToddGrun ToddGrun Sep 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dur, Todd


public T[] ToArrayAndClear()
{
var result = ToArray();
Clear();

return result;
}
=> ImmutableCollectionsMarshal.AsArray(ToImmutableAndClear()).AssumeNotNull();

public void Push(T item)
{
Expand Down
Loading