Skip to content

Commit

Permalink
Modify SyntaxNodeExtensions.GetMembers to instead execute a given lam…
Browse files Browse the repository at this point in the history
…bda over the collection. (#74628)

The scrolling speedometer profile I'm looking at is showing 0.7% of allocations during it's typing phase as boxing of the struct enumerators previously returned from SyntaxNodeExtensions.GetMembers.

Instead, as there is only one caller of this method (CSharpSyntaxFacts.AppendMembers), I've changed the method to take in a lambda and have it do the enumeration over the members, invoking the callback on each.
  • Loading branch information
ToddGrun committed Aug 1, 2024
1 parent 8fddb0e commit 2e04da5
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -757,15 +757,29 @@ public static SyntaxTokenList GetModifiers(this SyntaxNode? member)
_ => null,
};

public static IEnumerable<MemberDeclarationSyntax> GetMembers(this SyntaxNode? node)
=> node switch
public static void ForEachMember<TArg>(this SyntaxNode? node, Action<MemberDeclarationSyntax, TArg> callback, TArg arg)
{
// Separated out to allow for struct-based enumeration.
switch (node)
{
CompilationUnitSyntax compilation => compilation.Members,
BaseNamespaceDeclarationSyntax @namespace => @namespace.Members,
TypeDeclarationSyntax type => type.Members,
EnumDeclarationSyntax @enum => @enum.Members,
_ => [],
};
case CompilationUnitSyntax compilation:
foreach (var member in compilation.Members)
callback(member, arg);
break;
case BaseNamespaceDeclarationSyntax @namespace:
foreach (var member in @namespace.Members)
callback(member, arg);
break;
case TypeDeclarationSyntax type:
foreach (var member in type.Members)
callback(member, arg);
break;
case EnumDeclarationSyntax @enum:
foreach (var member in @enum.Members)
callback(member, arg);
break;
}
}

public static bool IsInExpressionTree(
[NotNullWhen(true)] this SyntaxNode? node,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -913,24 +913,24 @@ private void AppendMembers(SyntaxNode? node, ArrayBuilder<SyntaxNode> list, bool
{
Debug.Assert(topLevel || methodLevel);

foreach (var member in node.GetMembers())
{
if (IsTopLevelNodeWithMembers(member))
node.ForEachMember(static (member, arg) =>
{
if (topLevel)
var (@this, list, topLevel, methodLevel) = arg;
if (@this.IsTopLevelNodeWithMembers(member))
{
if (topLevel)
{
list.Add(member);
}
@this.AppendMembers(member, list, topLevel, methodLevel);
}
else if (methodLevel && @this.IsMethodLevelMember(member))
{
list.Add(member);
}

AppendMembers(member, list, topLevel, methodLevel);
continue;
}

if (methodLevel && IsMethodLevelMember(member))
{
list.Add(member);
}
}
},
(this, list, topLevel, methodLevel));
}

public TextSpan GetMemberBodySpanForSpeculativeBinding(SyntaxNode node)
Expand Down

0 comments on commit 2e04da5

Please sign in to comment.