Skip to content

Remove per-context delegate allocations in netcoreapp targets #80517

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 2 commits into from
Jan 20, 2023
Merged

Remove per-context delegate allocations in netcoreapp targets #80517

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f701b9f
Remove per-context delegate allocations in netcoreapp targets
eiriktsarpalis Jan 11, 2023
2d56aee
Ensure Options property doesn't get trimmed.
eiriktsarpalis Jan 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
14 changes: 11 additions & 3 deletions ...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,14 +156,17 @@ internal void ClearCaches()
internal sealed class CachingContext
{
private readonly ConcurrentDictionary<Type, JsonTypeInfo?> _jsonTypeInfoCache = new();
#if !NETCOREAPP
private readonly Func<Type, JsonTypeInfo?> _jsonTypeInfoFactory;
#endif

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

_jsonTypeInfoFactory = options.GetTypeInfoNoCaching;
#if !NETCOREAPP
_jsonTypeInfoFactory = Options.GetTypeInfoNoCaching;
#endif
}

public JsonSerializerOptions Options { get; }
Expand All @@ -172,7 +175,12 @@ 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, _jsonTypeInfoFactory);
public JsonTypeInfo? GetOrAddJsonTypeInfo(Type type) =>
#if NETCOREAPP
_jsonTypeInfoCache.GetOrAdd(type, static (type, options) => options.GetTypeInfoNoCaching(type), Options);
#else
_jsonTypeInfoCache.GetOrAdd(type, _jsonTypeInfoFactory);
#endif

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

Expand Down