Skip to content

Reduce allocations in NamespaceSymbol.GetExtensionContainers #78243

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 5 commits into from
Apr 23, 2025
Merged

Reduce allocations in NamespaceSymbol.GetExtensionContainers #78243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
85987d8
*** WIP: Reduce allocations in MergedNamespaceSymbol.GetTypeMembersUn…
ToddGrun Apr 22, 2025
9e8089e
Convert from using ArrayBuilders instead to just making GetExtensionC…
ToddGrun Apr 23, 2025
ddadc8a
don't duplicate logic
ToddGrun Apr 23, 2025
4d28a83
AddExtensionContainersForType => AddExtensionContainersInType
ToddGrun Apr 23, 2025
f4b5b31
Add comment with tracking bug information about suggestion to use IsC…
ToddGrun Apr 23, 2025
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
16 changes: 13 additions & 3 deletions src/Compilers/CSharp/Portable/Symbols/MergedNamespaceSymbol.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@
using System.Linq;
using System.Threading;
using Microsoft.CodeAnalysis.Collections;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.PooledObjects;
using Microsoft.CodeAnalysis.Text;

namespace Microsoft.CodeAnalysis.CSharp.Symbols
{
Expand Down Expand Up @@ -299,5 +296,18 @@ internal override void GetExtensionMethods(ArrayBuilder<MethodSymbol> methods, s
namespaceSymbol.GetExtensionMethods(methods, name, arity, options);
}
}

// Overridden to avoid NamespaceSymbol.GetExtensionContainers call to GetTypeMembersUnordered. The combination of the
// CreateRange and OfType Linq calls in MergedNamespaceSymbol.GetTypeMembersUnordered causes a full array allocation.
internal sealed override void GetExtensionContainers(ArrayBuilder<NamedTypeSymbol> extensions)
{
foreach (var member in GetMembersUnordered())
{
if (member is NamedTypeSymbol type)
{
AddExtensionContainersInType(type, extensions);
}
}
}
}
}
20 changes: 13 additions & 7 deletions src/Compilers/CSharp/Portable/Symbols/NamespaceSymbol.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,18 +355,24 @@ internal virtual void GetExtensionMethods(ArrayBuilder<MethodSymbol> methods, st
}
}

internal void GetExtensionContainers(ArrayBuilder<NamedTypeSymbol> extensions)
internal virtual void GetExtensionContainers(ArrayBuilder<NamedTypeSymbol> extensions)
{
foreach (var type in this.GetTypeMembersUnordered())
{
if (!type.IsReferenceType || !type.IsStatic || type.IsGenericType || !type.MightContainExtensionMethods) continue;
AddExtensionContainersInType(type, extensions);
}
}

protected void AddExtensionContainersInType(NamedTypeSymbol type, ArrayBuilder<NamedTypeSymbol> extensions)
{
// Consider whether IsClassType could be used instead. Tracked by https://github.com/dotnet/roslyn/issues/78275
if (!type.IsReferenceType || !type.IsStatic || type.IsGenericType || !type.MightContainExtensionMethods) return;
Copy link
Contributor

@AlekseyTs AlekseyTs Apr 23, 2025

Choose a reason for hiding this comment

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

IsReferenceType

I think we can replace this with IsClassType to optimize this code even more.

Copy link
Contributor Author

@ToddGrun ToddGrun Apr 23, 2025

Choose a reason for hiding this comment

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

That's not an obvious equivalence (for me, at least). I'd prefer not to make that change, but will if you would like me to.

Copy link
Contributor

@AlekseyTs AlekseyTs Apr 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Consider at least adding a comment capturing the suggestion and starting with // Tracked by https://github.com/dotnet/roslyn/issues/76130 :

Copy link
Contributor Author

@ToddGrun ToddGrun Apr 23, 2025

Choose a reason for hiding this comment

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

Done in commit 5


foreach (var nestedType in type.GetTypeMembersUnordered())
foreach (var nestedType in type.GetTypeMembersUnordered())
{
if (nestedType.IsExtension)
{
if (nestedType.IsExtension)
{
extensions.Add(nestedType);
}
extensions.Add(nestedType);
}
}
}
Expand Down