Support more collections in STJ source generator by layomia · Pull Request #55566 · dotnet/runtime

layomia · 2021-07-13T13:28:07Z

Fixes#53393. The collection trimming tests are not updated in this PR (#53437).

ghost · 2021-07-13T13:28:13Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, to please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

ghost · 2021-07-13T13:28:15Z

Tagging subscribers to this area: @eiriktsarpalis, @layomia
See info in area-owners.md if you want to be subscribed.

Issue Details

Fixes #53393. The collection trimming tests are not updated in this PR (#53437).

Author:	layomia
Assignees:	layomia
Labels:	`area-System.Text.Json`
Milestone:	6.0.0

steveharter

Misc feedback provided (none that can't be addressed after this PR)

Looks good pending green CI.

This new collection support is important to get in for Preview 7.

layomia · 2021-07-15T18:00:45Z

FYI @eerhardt

eiriktsarpalis · 2021-07-15T18:16:56Z

+
+ if (converter.RequiresDynamicMemberAccessors)
+ {
+ converter.Initialize(Options, this);


does this account for the possibility that one converter instance is initialized by multiple JsonTypeInfo instances? I think that it's occassionally possible although not sure it applies to converters that override RequiresDynamicMemberAccessors.

Hmm I think it could happen occasionally due to threading, but I think even in that case each JsonTypeInfo construction would create a separate converter instance, and the first one to complete would win, discarding the duplicates. Each converter instance would only be for a specific type, so there are no issues of creating invalid dynamic accessors.

eiriktsarpalis · 2021-07-15T18:22:56Z

 };

- string expectedJson = JsonSerializer.Serialize(source);
+ string expectedJson = await JsonSerializerWrapperForString.SerializeWrapper(source);


Since this method call is only used to generate the expected JSON string, we don't really need to exercise any async APIs here.

eiriktsarpalis · 2021-07-15T18:23:19Z

 };

- string expectedJson = JsonSerializer.Serialize(new { Data = source });
+ string expectedJson = await JsonSerializerWrapperForString.SerializeWrapper(new { Data = source });


Ditto for this and all the other expectedJson values in this file.

eiriktsarpalis · 2021-07-15T18:23:35Z

 using Xunit;

-namespace System.Text.Json.Tests.Serialization
+namespace System.Text.Json.Serialization.Tests


Thanks for fixing this!

eiriktsarpalis · 2021-07-15T18:40:52Z

 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
-using Utf8MemoryStream = System.Text.Json.Tests.Serialization.CollectionTests.Utf8MemoryStream;


FWIW the System.Text.Json.Tests.Serialization namespace has crept up in quite a few other places as well.

layomia · 2021-07-15T18:41:41Z

Test failures are unrelated. Will address further feedback in a follow-up.

layomia added the area-System.Text.Json label Jul 13, 2021

layomia added this to the 6.0.0 milestone Jul 13, 2021

layomia self-assigned this Jul 13, 2021

ghost added the new-api-needs-documentation label Jul 13, 2021

layomia mentioned this pull request Jul 13, 2021
Remove C# dynamic support from JsonNode #55430
Merged

layomia force-pushed the SrcGenCollections branch 5 times, most recently from 17ef405 to f78d7b9Compare July 14, 2021 16:28

layomia marked this pull request as ready for review July 14, 2021 16:30

layomia requested review from eiriktsarpalis, jozkee and steveharter as code owners July 14, 2021 16:30

layomia force-pushed the SrcGenCollections branch from f78d7b9 to ab75b8dCompare July 14, 2021 17:35

steveharter reviewed Jul 14, 2021
View reviewed changes

Comment threadsrc/libraries/System.Text.Json/Common/ReflectionExtensions.cs Outdated
Comment threadsrc/libraries/System.Text.Json/Common/ReflectionExtensions.cs Outdated

steveharter reviewed Jul 14, 2021
View reviewed changes

Comment threadsrc/libraries/System.Text.Json/gen/TypeGenerationSpec.cs Outdated

steveharter reviewed Jul 14, 2021
View reviewed changes

Comment threadsrc/libraries/System.Text.Json/gen/Reflection/TypeExtensions.cs Outdated

steveharter reviewed Jul 14, 2021
View reviewed changes

Comment threadsrc/libraries/System.Text.Json/gen/Reflection/TypeExtensions.cs Outdated

steveharter approved these changes Jul 14, 2021
View reviewed changes

layomia force-pushed the SrcGenCollections branch 3 times, most recently from 6ce1542 to 6c05c74Compare July 15, 2021 02:47

layomia closed this Jul 15, 2021

layomia reopened this Jul 15, 2021

layomia force-pushed the SrcGenCollections branch from 6c05c74 to 011c403Compare July 15, 2021 03:08

layomia closed this Jul 15, 2021

layomia reopened this Jul 15, 2021

layomia added 3 commits July 14, 2021 20:34

Support more collections in STJ source generator
6a30849

Fix tests
b0f2019

Revert redundant MLC change and address feedback
01ffde9

layomia force-pushed the SrcGenCollections branch from d408b89 to 01ffde9Compare July 15, 2021 03:35

eiriktsarpalis reviewed Jul 15, 2021
View reviewed changes

Comment threadsrc/libraries/System.Text.Json/gen/JsonSourceGenerator.Parser.cs

eiriktsarpalis reviewed Jul 15, 2021
View reviewed changes

Comment threadsrc/libraries/System.Text.Json/ref/System.Text.Json.cs

eiriktsarpalis reviewed Jul 15, 2021
View reviewed changes

Comment threadsrc/libraries/System.Text.Json/ref/System.Text.Json.cs

eiriktsarpalis reviewed Jul 15, 2021
View reviewed changes

layomia merged commit 0a5cf4e into dotnet:mainJul 15, 2021

eerhardt reviewed Jul 15, 2021
View reviewed changes

Comment thread...rc/System/Text/Json/Serialization/Converters/Collection/IEnumerableWithAddMethodConverter.cs

layomia mentioned this pull request Jul 16, 2021
Reimplement dynamic member access for collection converters correctly #55846
Merged

ManickaP mentioned this pull request Jul 20, 2021
[QUIC] Remove AppContext switch from S.N.Quic #56027
Merged

MaximLipnin mentioned this pull request Jul 21, 2021
[MacCatalyst] App crash in System.Text.Json.SourceGeneration.Tests #56085
Closed

layomia mentioned this pull request Jul 23, 2021
Using Queue, Queue<T>, Stack, and ConcurrentStack<T> as properties in classes deserialized by System.Text.Json does not work when trimmed #53205
Closed

ghost locked as resolved and limited conversation to collaborators Aug 15, 2021

Uh oh!

Conversation

layomia commented Jul 13, 2021

Uh oh!

ghost commented Jul 13, 2021

Uh oh!

ghost commented Jul 13, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

steveharter left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

layomia commented Jul 15, 2021

Uh oh!

eiriktsarpalisJul 15, 2021

Choose a reason for hiding this comment

Uh oh!

layomiaJul 15, 2021

Choose a reason for hiding this comment

Uh oh!

eiriktsarpalisJul 15, 2021

Choose a reason for hiding this comment

Uh oh!

eiriktsarpalisJul 15, 2021

Choose a reason for hiding this comment

Uh oh!

eiriktsarpalisJul 15, 2021

Choose a reason for hiding this comment

Uh oh!

eiriktsarpalisJul 15, 2021

Choose a reason for hiding this comment

Uh oh!

layomia commented Jul 15, 2021

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants