Remove unnecessary properties from ReadStackFrame.

eiriktsarpalis · eiriktsarpalis · commit 1cb3f3f66118 · 2023-04-24T15:48:06.000+01:00
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/JsonCollectionConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/JsonCollectionConverter.cs
@@ -25,7 +25,7 @@ internal abstract class JsonCollectionConverter<TCollection, TElement> : JsonRes
         /// </summary>
         protected virtual void CreateCollection(ref Utf8JsonReader reader, scoped ref ReadStack state, JsonSerializerOptions options)
         {
-            if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
+            if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
             {
                 return;
             }
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/JsonDictionaryConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/JsonDictionaryConverter.cs
@@ -40,7 +40,7 @@ protected virtual void ConvertCollection(ref ReadStack state, JsonSerializerOpti
         /// </summary>
         protected virtual void CreateCollection(ref Utf8JsonReader reader, scoped ref ReadStack state)
         {
-            if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
+            if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
             {
                 return;
             }
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ListOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ListOfTConverter.cs
@@ -20,7 +20,7 @@ protected override void Add(in TElement value, ref ReadStack state)
 
         protected override void CreateCollection(ref Utf8JsonReader reader, scoped ref ReadStack state, JsonSerializerOptions options)
         {
-            if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
+            if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
             {
                 return;
             }
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/QueueOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/QueueOfTConverter.cs
@@ -18,7 +18,7 @@ protected override void Add(in TElement value, ref ReadStack state)
 
         protected override void CreateCollection(ref Utf8JsonReader reader, scoped ref ReadStack state, JsonSerializerOptions options)
         {
-            if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
+            if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
             {
                 return;
             }
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/StackOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/StackOfTConverter.cs
@@ -19,7 +19,7 @@ protected override void Add(in TElement value, ref ReadStack state)
 
         protected override void CreateCollection(ref Utf8JsonReader reader, scoped ref ReadStack state, JsonSerializerOptions options)
         {
-            if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
+            if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
             {
                 return;
             }
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/StackOrQueueConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/StackOrQueueConverter.cs
@@ -22,7 +22,7 @@ protected sealed override void Add(in object? value, ref ReadStack state)
 
         protected sealed override void CreateCollection(ref Utf8JsonReader reader, scoped ref ReadStack state, JsonSerializerOptions options)
         {
-            if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
+            if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
             {
                 return;
             }
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectDefaultConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectDefaultConverter.cs
@@ -32,7 +32,7 @@ internal override bool OnTryRead(ref Utf8JsonReader reader, Type typeToConvert,
                     ThrowHelper.ThrowJsonException_DeserializeUnableToConvertValue(TypeToConvert);
                 }
 
-                if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
+                if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
                 {
                     obj = state.Current.ReturnValue!;
                 }
@@ -108,7 +108,7 @@ internal override bool OnTryRead(ref Utf8JsonReader reader, Type typeToConvert,
                         return true;
                     }
 
-                    if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
+                    if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
                     {
                         obj = state.Current.ReturnValue!;
                     }
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectWithParameterizedConstructorConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectWithParameterizedConstructorConverter.cs
@@ -45,7 +45,7 @@ internal sealed override bool OnTryRead(ref Utf8JsonReader reader, Type typeToCo
                     ThrowHelper.ThrowJsonException_DeserializeUnableToConvertValue(TypeToConvert);
                 }
 
-                if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
+                if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
                 {
                     object populatedObject = state.Current.ReturnValue!;
                     PopulatePropertiesFastPath(populatedObject, jsonTypeInfo, options, ref reader, ref state);
@@ -157,7 +157,7 @@ internal sealed override bool OnTryRead(ref Utf8JsonReader reader, Type typeToCo
                 // Metadata is disallowed with Populate option and therefore ordering here is irrelevant.
                 // Since state.Current.IsPopulating is being checked early on in this method the continuation
                 // will be handled there.
-                if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
+                if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)
                 {
                     object populatedObject = state.Current.ReturnValue!;
 
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonConverterOfT.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonConverterOfT.cs
@@ -281,8 +281,7 @@ internal bool TryRead(ref Utf8JsonReader reader, Type typeToConvert, JsonSeriali
 
             if (parentObj != null && propertyInfo != null && !propertyInfo.IsForTypeInfo)
             {
-                state.Current.ParentObject = parentObj;
-                state.Current.ParentProperty = propertyInfo;
+                state.Current.HasParentObject = true;
             }
 
             success = OnTryRead(ref reader, typeToConvert, options, ref state, out value);
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs
@@ -808,9 +808,9 @@ internal bool TryGetPrePopulatedValue(scoped ref ReadStack state)
                 return false;
 
             Debug.Assert(EffectiveConverter.CanPopulate, "Property is marked with Populate but converter cannot populate. This should have been validated in Configure");
-            Debug.Assert(state.Current.ParentObject != null, "Parent object is null");
+            Debug.Assert(state.Parent.ReturnValue != null, "Parent object is null");
             Debug.Assert(!state.Current.IsPopulating, "We've called TryGetPrePopulatedValue more than once");
-            object? value = Get!(state.Current.ParentObject);
+            object? value = Get!(state.Parent.ReturnValue);
             state.Current.ReturnValue = value;
             state.Current.IsPopulating = value != null;
             return value != null;
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReadStack.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReadStack.cs
@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Buffers;
 using System.Collections;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
@@ -16,10 +15,26 @@ namespace System.Text.Json
     internal struct ReadStack
     {
         /// <summary>
-        /// Exposes the stackframe that is currently active.
+        /// Exposes the stack frame that is currently active.
         /// </summary>
         public ReadStackFrame Current;
 
+        /// <summary>
+        /// Gets the parent stack frame, if it exists.
+        /// </summary>
+        public readonly ref ReadStackFrame Parent
+        {
+            get
+            {
+                Debug.Assert(_count > 1);
+                Debug.Assert(_stack is not null);
+                return ref _stack[_count - 2];
+            }
+        }
+
+        public readonly JsonPropertyInfo? ParentProperty
+            => Current.HasParentObject ? Parent.JsonPropertyInfo : null;
+
         /// <summary>
         /// Buffer containing all frames in the stack. For performance it is only populated for serialization depths > 1.
         /// </summary>
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReadStackFrame.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReadStackFrame.cs
@@ -74,9 +74,8 @@ public JsonTypeInfo BaseJsonTypeInfo
         // Every required JsonPropertyInfo has RequiredPropertyIndex property which maps to an index in this BitArray.
         public BitArray? RequiredPropertiesSet;
 
-        // Needed for populating properties
-        public object? ParentObject;
-        public JsonPropertyInfo? ParentProperty;
+        // Tracks state related to property population.
+        public bool HasParentObject;
         public bool IsPopulating;
 
         public void EndConstructorParameter()
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/WriteStack.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/WriteStack.cs
@@ -20,14 +20,14 @@ internal struct WriteStack
         public readonly int CurrentDepth => _count;
 
         /// <summary>
-        /// Exposes the stackframe that is currently active.
+        /// Exposes the stack frame that is currently active.
         /// </summary>
         public WriteStackFrame Current;
 
         /// <summary>
-        /// Gets the parent stackframe, if it exists.
+        /// Gets the parent stack frame, if it exists.
         /// </summary>
-        public ref WriteStackFrame Parent
+        public readonly ref WriteStackFrame Parent
         {
             get
             {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ internal abstract class JsonCollectionConverter<TCollection, TElement> : JsonRes`
`25`	`25`	`/// </summary>`
`26`	`26`	`protected virtual void CreateCollection(ref Utf8JsonReader reader, scoped ref ReadStack state, JsonSerializerOptions options)`
`27`	`27`	`{`
`28`		`- if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
	`28`	`+ if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
`29`	`29`	`{`
`30`	`30`	`return;`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ protected virtual void ConvertCollection(ref ReadStack state, JsonSerializerOpti`
`40`	`40`	`/// </summary>`
`41`	`41`	`protected virtual void CreateCollection(ref Utf8JsonReader reader, scoped ref ReadStack state)`
`42`	`42`	`{`
`43`		`- if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
	`43`	`+ if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
`44`	`44`	`{`
`45`	`45`	`return;`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ protected override void Add(in TElement value, ref ReadStack state)`
`20`	`20`
`21`	`21`	`protected override void CreateCollection(ref Utf8JsonReader reader, scoped ref ReadStack state, JsonSerializerOptions options)`
`22`	`22`	`{`
`23`		`- if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
	`23`	`+ if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
`24`	`24`	`{`
`25`	`25`	`return;`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ protected override void Add(in TElement value, ref ReadStack state)`
`18`	`18`
`19`	`19`	`protected override void CreateCollection(ref Utf8JsonReader reader, scoped ref ReadStack state, JsonSerializerOptions options)`
`20`	`20`	`{`
`21`		`- if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
	`21`	`+ if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
`22`	`22`	`{`
`23`	`23`	`return;`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ protected override void Add(in TElement value, ref ReadStack state)`
`19`	`19`
`20`	`20`	`protected override void CreateCollection(ref Utf8JsonReader reader, scoped ref ReadStack state, JsonSerializerOptions options)`
`21`	`21`	`{`
`22`		`- if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
	`22`	`+ if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
`23`	`23`	`{`
`24`	`24`	`return;`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ protected sealed override void Add(in object? value, ref ReadStack state)`
`22`	`22`
`23`	`23`	`protected sealed override void CreateCollection(ref Utf8JsonReader reader, scoped ref ReadStack state, JsonSerializerOptions options)`
`24`	`24`	`{`
`25`		`- if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
	`25`	`+ if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
`26`	`26`	`{`
`27`	`27`	`return;`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ internal override bool OnTryRead(ref Utf8JsonReader reader, Type typeToConvert,`
`32`	`32`	`ThrowHelper.ThrowJsonException_DeserializeUnableToConvertValue(TypeToConvert);`
`33`	`33`	`}`
`34`	`34`
`35`		`- if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
	`35`	`+ if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
`36`	`36`	`{`
`37`	`37`	`obj = state.Current.ReturnValue!;`
`38`	`38`	`}`
`@@ -108,7 +108,7 @@ internal override bool OnTryRead(ref Utf8JsonReader reader, Type typeToConvert,`
`108`	`108`	`return true;`
`109`	`109`	`}`
`110`	`110`
`111`		`- if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
	`111`	`+ if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
`112`	`112`	`{`
`113`	`113`	`obj = state.Current.ReturnValue!;`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ internal sealed override bool OnTryRead(ref Utf8JsonReader reader, Type typeToCo`
`45`	`45`	`ThrowHelper.ThrowJsonException_DeserializeUnableToConvertValue(TypeToConvert);`
`46`	`46`	`}`
`47`	`47`
`48`		`- if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
	`48`	`+ if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
`49`	`49`	`{`
`50`	`50`	`object populatedObject = state.Current.ReturnValue!;`
`51`	`51`	`PopulatePropertiesFastPath(populatedObject, jsonTypeInfo, options, ref reader, ref state);`
`@@ -157,7 +157,7 @@ internal sealed override bool OnTryRead(ref Utf8JsonReader reader, Type typeToCo`
`157`	`157`	`// Metadata is disallowed with Populate option and therefore ordering here is irrelevant.`
`158`	`158`	`// Since state.Current.IsPopulating is being checked early on in this method the continuation`
`159`	`159`	`// will be handled there.`
`160`		`- if (state.Current.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
	`160`	`+ if (state.ParentProperty?.TryGetPrePopulatedValue(ref state) == true)`
`161`	`161`	`{`
`162`	`162`	`object populatedObject = state.Current.ReturnValue!;`
`163`	`163`
Original file line number	Diff line number	Diff line change
`@@ -281,8 +281,7 @@ internal bool TryRead(ref Utf8JsonReader reader, Type typeToConvert, JsonSeriali`
`281`	`281`
`282`	`282`	`if (parentObj != null && propertyInfo != null && !propertyInfo.IsForTypeInfo)`
`283`	`283`	`{`
`284`		`- state.Current.ParentObject = parentObj;`
`285`		`- state.Current.ParentProperty = propertyInfo;`
	`284`	`+ state.Current.HasParentObject = true;`
`286`	`285`	`}`
`287`	`286`
`288`	`287`	`success = OnTryRead(ref reader, typeToConvert, options, ref state, out value);`