Update for recent compiler changes for ref fields #73466
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Tagging subscribers to this area: @dotnet/area-system-text-json, @gregsdennis Issue DetailsSee dotnet/roslyn#62886.
|
|
Are all of these changes necessary in order to successfully compile? If yes, this seems like a fairly significant breaking change, no? Or are these changes only necessary because of related places we're already using scoped? |
jaredpar
reviewed
Aug 5, 2022
...m.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryConverter.cs
Outdated
Show resolved
Hide resolved
Yes, these are changes needed to compile successfully. These are typically methods that have a |
stephentoub
reviewed
Aug 5, 2022
| @@ -13,13 +13,13 @@ internal sealed class ArrayConverter<TCollection, TElement> : IEnumerableDefault | |||
| { | |||
| internal override bool CanHaveMetadata => false; | |||
|
|
|||
| protected override void Add(in TElement value, ref ReadStack state) | |||
| protected override void Add(in TElement value, scoped ref ReadStack state) | |||
There was a problem hiding this comment.
Why is scoped required here?
stephentoub
reviewed
Aug 5, 2022
This was referenced Aug 5, 2022
jaredpar
reviewed
Aug 11, 2022
| @@ -9,7 +9,7 @@ internal sealed class ConcurrentQueueOfTConverter<TCollection, TElement> | |||
| : IEnumerableDefaultConverter<TCollection, TElement> | |||
| where TCollection : ConcurrentQueue<TElement> | |||
| { | |||
| protected override void Add(in TElement value, ref ReadStack state) | |||
| protected override void Add(in TElement value, scoped ref ReadStack state) | |||
jaredpar
reviewed
Aug 11, 2022
| @@ -16,7 +16,7 @@ internal sealed class IDictionaryOfTKeyTValueConverter<TDictionary, TKey, TValue | |||
| where TDictionary : IDictionary<TKey, TValue> | |||
| where TKey : notnull | |||
| { | |||
| protected override void Add(TKey key, in TValue value, JsonSerializerOptions options, ref ReadStack state) | |||
| protected override void Add(TKey key, in TValue value, JsonSerializerOptions options, scoped ref ReadStack state) | |||
jaredpar
reviewed
Aug 11, 2022
| @@ -17,13 +17,13 @@ internal sealed class IEnumerableConverter<TCollection> | |||
| { | |||
| private readonly bool _isDeserializable = typeof(TCollection).IsAssignableFrom(typeof(List<object?>)); | |||
|
|
|||
| protected override void Add(in object? value, ref ReadStack state) | |||
| protected override void Add(in object? value, scoped ref ReadStack state) | |||
jaredpar
reviewed
Aug 11, 2022
| @@ -15,13 +15,13 @@ internal sealed class IEnumerableOfTConverter<TCollection, TElement> | |||
| { | |||
| private readonly bool _isDeserializable = typeof(TCollection).IsAssignableFrom(typeof(List<TElement>)); | |||
|
|
|||
| protected override void Add(in TElement value, ref ReadStack state) | |||
| protected override void Add(in TElement value, scoped ref ReadStack state) | |||
jaredpar
reviewed
Aug 11, 2022
| @@ -9,7 +9,7 @@ internal sealed class ConcurrentStackOfTConverter<TCollection, TElement> | |||
| : IEnumerableDefaultConverter<TCollection, TElement> | |||
| where TCollection : ConcurrentStack<TElement> | |||
| { | |||
| protected override void Add(in TElement value, ref ReadStack state) | |||
| protected override void Add(in TElement value, scoped ref ReadStack state) | |||
jaredpar
approved these changes
Aug 11, 2022
|
I don't see any failures in the arm64 test. Looks like an infrastructure issue. [15:05:31.5263400] 2022-08-12 15:05:31.506 System.Runtime.Tests[16226:178107346] Tests run: 49815 Passed: 49582 Inconclusive: 0 Failed: 0 Ignored: 137 Skipped: 96 |
AaronRobinsonMSFT
approved these changes
Aug 13, 2022
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See dotnet/roslyn#62886.