Skip to content

Ensure serializer reflection-dependency sentinel is accurate #67104

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
carlossanlop merged 3 commits into from
Apr 13, 2022
Merged

Ensure serializer reflection-dependency sentinel is accurate #67104

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44a62f3
Ensure serializer reflection-dependency sentinel is accurate
eiriktsarpalis Mar 23, 2022
7ffd968
update servicing version
eiriktsarpalis Mar 25, 2022
2d6f600
Merge branch 'release/6.0' into fix-root-dependency-bug
carlossanlop Apr 13, 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
7 changes: 4 additions & 3 deletions ...s/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptions.Converters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using System.Text.Json.Serialization;
using System.Text.Json.Serialization.Converters;
using System.Text.Json.Serialization.Metadata;
using System.Threading;

namespace System.Text.Json
{
Expand All @@ -30,10 +31,10 @@ public sealed partial class JsonSerializerOptions
[RequiresUnreferencedCode(JsonSerializer.SerializationUnreferencedCodeMessage)]
private void RootBuiltInConverters()
{
if (s_defaultSimpleConverters is null)
if (Volatile.Read(ref s_defaultFactoryConverters) is null)
Copy link
Copy Markdown
Contributor

@carlossanlop carlossanlop Mar 24, 2022

Choose a reason for hiding this comment

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

I know this could not be a direct backport. So I assume the comments in the main change do not apply here? https://github.com/dotnet/runtime/pull/66522/files#diff-143351693c2cb653ad82e34086cfd8863b0bda66c8b498ed8a400924c4f5224e

Copy link
Copy Markdown
Member Author

@eiriktsarpalis eiriktsarpalis Mar 25, 2022

Choose a reason for hiding this comment

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

They do, but this is fairly standard use of Volatile so I don't believe it warrants explanation.

{
s_defaultSimpleConverters = GetDefaultSimpleConverters();
s_defaultFactoryConverters = new JsonConverter[]
Volatile.Write(ref s_defaultFactoryConverters, new JsonConverter[]
Comment thread
jkotas marked this conversation as resolved.
{
// Check for disallowed types.
new UnsupportedTypeConverterFactory(),
Expand All @@ -48,7 +49,7 @@ private void RootBuiltInConverters()
new IEnumerableConverterFactory(),
// Object should always be last since it converts any type.
new ObjectConverterFactory()
};
});
}
}

Expand Down