Skip to content

Fix delegate allocation in CachingContext.GetOrAddJsonTypeInfo #80437

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 3 commits into from
Jan 11, 2023
Merged

Fix delegate allocation in CachingContext.GetOrAddJsonTypeInfo #80437

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e67eb7e
Fix delegate allocation in CachingContext.GetOrAddJsonTypeInfo
stephentoub Jan 10, 2023
a9b4026
Address PR feedback
stephentoub Jan 10, 2023
a5c7fb9
Merge branch 'dotnet:main' into jsonalloc
stephentoub Jan 11, 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
6 changes: 5 additions & 1 deletion ...ries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptions.Caching.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,14 @@ internal void ClearCaches()
internal sealed class CachingContext
{
private readonly ConcurrentDictionary<Type, JsonTypeInfo?> _jsonTypeInfoCache = new();
private readonly Func<Type, JsonTypeInfo?> _jsonTypeInfoFactory;
Copy link
Member

@krwq krwq Jan 10, 2023

Choose a reason for hiding this comment

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

consider adding comment why we're doing this (it's one of the things I'd personally by default choose shorter code)


public CachingContext(JsonSerializerOptions options, int hashCode)
{
Options = options;
HashCode = hashCode;

_jsonTypeInfoFactory = options.GetTypeInfoNoCaching;
}

public JsonSerializerOptions Options { get; }
Expand All @@ -169,7 +172,8 @@ public CachingContext(JsonSerializerOptions options, int hashCode)
// If changing please ensure that src/ILLink.Descriptors.LibraryBuild.xml is up-to-date.
public int Count => _jsonTypeInfoCache.Count;

public JsonTypeInfo? GetOrAddJsonTypeInfo(Type type) => _jsonTypeInfoCache.GetOrAdd(type, Options.GetTypeInfoNoCaching);
public JsonTypeInfo? GetOrAddJsonTypeInfo(Type type) => _jsonTypeInfoCache.GetOrAdd(type, _jsonTypeInfoFactory);

public bool TryGetJsonTypeInfo(Type type, [NotNullWhen(true)] out JsonTypeInfo? typeInfo) => _jsonTypeInfoCache.TryGetValue(type, out typeInfo);

public void Clear()
Expand Down