Skip to content

Incorporate review feedback from #64646 #65376

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
eiriktsarpalis merged 3 commits into from
Feb 15, 2022
Merged

Incorporate review feedback from #64646 #65376

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a4d140
Incorporate review feedback from
eiriktsarpalis Feb 15, 2022
097aed3
Prevent trimming of unused CachingContext.Count method
eiriktsarpalis Feb 15, 2022
18aa4ae
use correct syntax for nested types
eiriktsarpalis Feb 15, 2022
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
Prev Previous commit
Next Next commit
Prevent trimming of unused CachingContext.Count method
  • Loading branch information
@eiriktsarpalis
eiriktsarpalis committed Feb 15, 2022
commit 097aed3f47f9c92f87a8f26f4bfe6e789a4a5575
8 changes: 8 additions & 0 deletions src/libraries/System.Text.Json/src/ILLink/ILLink.Descriptors.LibraryBuild.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<linker>
<assembly fullname="System.Text.Json">
<type fullname="System.Text.Json.JsonSerializerOptions+CachingContext">
<!-- Internal API used by tests only. -->
<method name="get_Count" />
</type>
</assembly>
</linker>
3 changes: 2 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 @@ -90,10 +90,11 @@ internal sealed class CachingContext
public CachingContext(JsonSerializerOptions options)
{
Options = options;
_ = Count;
}

public JsonSerializerOptions Options { get; }
// Property only accessed by reflection in testing -- do not remove.
// If changing please ensure that src/ILLink.Descriptors.LibraryBuild.xml is up-to-date.
public int Count => _converterCache.Count + _jsonTypeInfoCache.Count;
public JsonConverter GetOrAddConverter(Type type) => _converterCache.GetOrAdd(type, Options.GetConverterFromType);
public JsonTypeInfo GetOrAddJsonTypeInfo(Type type) => _jsonTypeInfoCache.GetOrAdd(type, Options.GetJsonTypeInfoFromContextOrCreate);
Expand Down