Skip to content
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

Jump to bottom

Cache SubstitutedNamedTypeSymbol.GetMembers to avoid unnecessary allocations #69164

Merged
merged 3 commits into from
Aug 14, 2023
Merged

Cache SubstitutedNamedTypeSymbol.GetMembers to avoid unnecessary allocations #69164

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f24d6b1
Cache SubstitutedNamedTypeSymbol.GetMembers to avoid unnecessary allo…
Youssef1313 Jul 22, 2023
3a53409
Add `ConditionallyDeOrder` when using cached ordered members in `GetM…
Youssef1313 Jul 24, 2023
d5bb208
Address review comment
Youssef1313 Aug 12, 2023
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
11 changes: 10 additions & 1 deletion src/Compilers/CSharp/Portable/Symbols/SubstitutedNamedTypeSymbol.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ internal abstract class SubstitutedNamedTypeSymbol : WrappedNamedTypeSymbol
// lazily created, does not need to be unique
private ConcurrentCache<string, ImmutableArray<Symbol>> _lazyMembersByNameCache;

private ImmutableArray<Symbol> _lazyMembers;

protected SubstitutedNamedTypeSymbol(Symbol newContainer, TypeMap map, NamedTypeSymbol originalDefinition, NamedTypeSymbol constructedFrom = null, bool unbound = false, TupleExtraData tupleData = null)
: base(originalDefinition, tupleData)
{
Expand Down Expand Up @@ -209,6 +211,11 @@ public sealed override ImmutableArray<NamedTypeSymbol> GetTypeMembers(ReadOnlyMe

public sealed override ImmutableArray<Symbol> GetMembers()
{
if (!_lazyMembers.IsDefault)
{
return _lazyMembers;
}

var builder = ArrayBuilder<Symbol>.GetInstance();

if (_unbound)
Expand All @@ -232,7 +239,9 @@ public sealed override ImmutableArray<Symbol> GetMembers()

builder = AddOrWrapTupleMembersIfNecessary(builder);

return builder.ToImmutableAndFree();
var result = builder.ToImmutableAndFree();
ImmutableInterlocked.InterlockedInitialize(ref _lazyMembers, result);
return _lazyMembers;
}

private ArrayBuilder<Symbol> AddOrWrapTupleMembersIfNecessary(ArrayBuilder<Symbol> builder)
Expand Down