[release/9.0] Update field references in property accessors (#108222)

github-actions[bot] · cston · stephentoub · web-flow · commit 226c0347b92c · 2024-10-10T11:56:25.000-04:00
* Update field references in property accessors * Update field references in property accessors (#108225) * Update field references in property accessors (#108413) * Update field references in property accessors * Update field references * Use @ * Rename field --------- Co-authored-by: Stephen Toub <stoub@microsoft.com> --------- Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com> Co-authored-by: Stephen Toub <stoub@microsoft.com>
diff --git a/src/coreclr/tools/Common/TypeSystem/Common/TypeDesc.TypeEquivalence.cs b/src/coreclr/tools/Common/TypeSystem/Common/TypeDesc.TypeEquivalence.cs
@@ -136,20 +136,20 @@ public bool TypeHasCharacteristicsRequiredToBeLoadableTypeEquivalentType
                             return false;
                     }
 
-                    foreach (var field in GetFields())
+                    foreach (var fieldInfo in GetFields())
                     {
-                        if (field.IsLiteral)
+                        if (fieldInfo.IsLiteral)
                         {
                             // Literal fields are ok
                             continue;
                         }
 
-                        if (field.IsStatic)
+                        if (fieldInfo.IsStatic)
                         {
                             return false;
                         }
 
-                        if (field.GetEffectiveVisibility() != EffectiveVisibility.Public)
+                        if (fieldInfo.GetEffectiveVisibility() != EffectiveVisibility.Public)
                         {
                             return false;
                         }
diff --git a/src/coreclr/tools/Common/TypeSystem/Common/TypeDesc.cs b/src/coreclr/tools/Common/TypeSystem/Common/TypeDesc.cs
@@ -472,10 +472,10 @@ public virtual TypeDesc UnderlyingType
                 if (!this.IsEnum)
                     return this;
 
-                foreach (var field in this.GetFields())
+                foreach (var fieldInfo in this.GetFields())
                 {
-                    if (!field.IsStatic)
-                        return field.FieldType;
+                    if (!fieldInfo.IsStatic)
+                        return fieldInfo.FieldType;
                 }
 
                 ThrowHelper.ThrowTypeLoadException(ExceptionStringID.ClassLoadGeneral, this);
diff --git a/src/coreclr/tools/Common/TypeSystem/Ecma/EcmaType.cs b/src/coreclr/tools/Common/TypeSystem/Ecma/EcmaType.cs
@@ -464,9 +464,9 @@ public override TypeDesc UnderlyingType
 
                 foreach (var handle in _typeDefinition.GetFields())
                 {
-                    var field = _module.GetField(handle, this);
-                    if (!field.IsStatic)
-                        return field.FieldType;
+                    var fieldInfo = _module.GetField(handle, this);
+                    if (!fieldInfo.IsStatic)
+                        return fieldInfo.FieldType;
                 }
 
                 return base.UnderlyingType; // Use the base implementation to get consistent error behavior
diff --git a/src/libraries/Common/src/System/Net/CookieParser.cs b/src/libraries/Common/src/System/Net/CookieParser.cs
@@ -553,9 +553,9 @@ private static FieldInfo IsQuotedDomainField
                 if (s_isQuotedDomainField == null)
                 {
                     // TODO https://github.com/dotnet/runtime/issues/19348:
-                    FieldInfo? field = typeof(Cookie).GetField("IsQuotedDomain", BindingFlags.Instance | BindingFlags.NonPublic);
-                    Debug.Assert(field != null, "We need to use an internal field named IsQuotedDomain that is declared on Cookie.");
-                    s_isQuotedDomainField = field;
+                    FieldInfo? fieldInfo = typeof(Cookie).GetField("IsQuotedDomain", BindingFlags.Instance | BindingFlags.NonPublic);
+                    Debug.Assert(fieldInfo != null, "We need to use an internal field named IsQuotedDomain that is declared on Cookie.");
+                    s_isQuotedDomainField = fieldInfo;
                 }
 
                 return s_isQuotedDomainField;
@@ -570,9 +570,9 @@ private static FieldInfo IsQuotedVersionField
                 if (s_isQuotedVersionField == null)
                 {
                     // TODO https://github.com/dotnet/runtime/issues/19348:
-                    FieldInfo? field = typeof(Cookie).GetField("IsQuotedVersion", BindingFlags.Instance | BindingFlags.NonPublic);
-                    Debug.Assert(field != null, "We need to use an internal field named IsQuotedVersion that is declared on Cookie.");
-                    s_isQuotedVersionField = field;
+                    FieldInfo? fieldInfo = typeof(Cookie).GetField("IsQuotedVersion", BindingFlags.Instance | BindingFlags.NonPublic);
+                    Debug.Assert(fieldInfo != null, "We need to use an internal field named IsQuotedVersion that is declared on Cookie.");
+                    s_isQuotedVersionField = fieldInfo;
                 }
 
                 return s_isQuotedVersionField;
diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Symbol.cs b/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Symbol.cs
@@ -131,9 +131,9 @@ public bool isStatic
         {
             get
             {
-                if (this is FieldSymbol field)
+                if (this is FieldSymbol fieldInfo)
                 {
-                    return field.isStatic;
+                    return fieldInfo.isStatic;
                 }
 
                 if (this is EventSymbol ev)
diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataMember.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataMember.cs
@@ -170,8 +170,8 @@ internal Type MemberType
                 {
                     if (_memberType == null)
                     {
-                        if (MemberInfo is FieldInfo field)
-                            _memberType = field.FieldType;
+                        if (MemberInfo is FieldInfo fieldInfo)
+                            _memberType = fieldInfo.FieldType;
                         else if (MemberInfo is PropertyInfo prop)
                             _memberType = prop.PropertyType;
                         else
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Serialization/Models.cs b/src/libraries/System.Private.Xml/src/System/Xml/Serialization/Models.cs
@@ -431,8 +431,8 @@ internal ConstantModel[] Constants
                     FieldInfo[] fields = Type.GetFields();
                     for (int i = 0; i < fields.Length; i++)
                     {
-                        FieldInfo field = fields[i];
-                        ConstantModel? constant = GetConstantModel(field);
+                        FieldInfo fieldInfo = fields[i];
+                        ConstantModel? constant = GetConstantModel(fieldInfo);
                         if (constant != null) list.Add(constant);
                     }
                     _constants = list.ToArray();
diff --git a/src/libraries/System.Reflection.TypeExtensions/tests/TypeTests.cs b/src/libraries/System.Reflection.TypeExtensions/tests/TypeTests.cs
@@ -792,8 +792,8 @@ public class GenericClassWithVarArgMethod<T>
 
         public T publicField
         {
-            get { return field; }
-            set { field = value; }
+            get { return this.field; }
+            set { this.field = value; }
         }
 
         public T ReturnAndSetField(T newFieldValue, params T[] moreFieldValues)
@@ -815,8 +815,8 @@ public class ClassWithVarArgMethod
 
         public int publicField
         {
-            get { return field; }
-            set { field = value; }
+            get { return this.field; }
+            set { this.field = value; }
         }
 
         public int ReturnAndSetField(int newFieldValue, params int[] moreFieldValues)
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis/AddLambdaCapturingThis.cs b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis/AddLambdaCapturingThis.cs
@@ -12,7 +12,7 @@ public AddLambdaCapturingThis()
             field = "abcd";
         }
 
-        public string GetField => field;
+        public string GetField => this.field;
 
         private string field;
 
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis/AddLambdaCapturingThis_v1.cs b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis/AddLambdaCapturingThis_v1.cs
@@ -12,7 +12,7 @@ public AddLambdaCapturingThis()
             field = "abcd";
         }
 
-        public string GetField => field;
+        public string GetField => this.field;
 
         private string field;
 
diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/SerializationTestTypes/DataContract.cs b/src/libraries/System.Runtime.Serialization.Xml/tests/SerializationTestTypes/DataContract.cs
@@ -1057,9 +1057,9 @@ public Type MemberType
         {
             get
             {
-                FieldInfo field = MemberInfo as FieldInfo;
-                if (field != null)
-                    return field.FieldType;
+                FieldInfo fieldInfo = MemberInfo as FieldInfo;
+                if (fieldInfo != null)
+                    return fieldInfo.FieldType;
                 return ((PropertyInfo)MemberInfo).PropertyType;
             }
         }
diff --git a/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.+=.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.+=.cs
@@ -302,12 +302,12 @@ public Dele Field
         {
             get
             {
-                return field;
+                return this.field;
             }
 
             set
             {
-                field = value;
+                this.field = value;
             }
         }
 
@@ -372,12 +372,12 @@ public Dele Field
         {
             get
             {
-                return field;
+                return this.field;
             }
 
             set
             {
-                field = value;
+                this.field = value;
             }
         }
 
diff --git a/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.-=.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.-=.cs
@@ -776,12 +776,12 @@ public Dele Field
         {
             get
             {
-                return field;
+                return this.field;
             }
 
             set
             {
-                field = value;
+                this.field = value;
             }
         }
 
@@ -864,12 +864,12 @@ public Dele Field
         {
             get
             {
-                return field;
+                return this.field;
             }
 
             set
             {
-                field = value;
+                this.field = value;
             }
         }
 
@@ -952,12 +952,12 @@ public Dele Field
         {
             get
             {
-                return field;
+                return this.field;
             }
 
             set
             {
-                field = value;
+                this.field = value;
             }
         }
 
@@ -1041,12 +1041,12 @@ public Dele Field
         {
             get
             {
-                return field;
+                return this.field;
             }
 
             set
             {
-                field = value;
+                this.field = value;
             }
         }
 
diff --git a/src/tools/illink/test/ILLink.Tasks.Tests/Mock.cs b/src/tools/illink/test/ILLink.Tasks.Tests/Mock.cs
@@ -37,8 +37,8 @@ public MockDriver CreateDriver ()
 
 		public static string[] OptimizationNames {
 			get {
-				var field = typeof (ILLink).GetField ("_optimizationNames", BindingFlags.NonPublic | BindingFlags.Static);
-				return (string[]) field.GetValue (null);
+				var fieldInfo = typeof (ILLink).GetField ("_optimizationNames", BindingFlags.NonPublic | BindingFlags.Static);
+				return (string[]) fieldInfo.GetValue (null);
 			}
 		}
 
diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/MemberUsedViaReflection.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/MemberUsedViaReflection.cs
@@ -139,14 +139,14 @@ static void TestIfElse (bool decision)
 		private class SimpleType
 		{
 			[Kept]
-			public static int field;
+			public static int fieldKept;
 
 			[Kept]
 			public int memberKept {
 				[Kept]
-				get { return field; }
+				get { return fieldKept; }
 				[Kept]
-				set { field = value; }
+				set { fieldKept = value; }
 			}
 
 			[Kept]
@@ -508,4 +508,4 @@ public static class PrefixLookupNestedType { }
 			private static class PrefixLookupPrivateNestedType { }
 		}
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -136,20 +136,20 @@ public bool TypeHasCharacteristicsRequiredToBeLoadableTypeEquivalentType`
`136`	`136`	`return false;`
`137`	`137`	`}`
`138`	`138`
`139`		`- foreach (var field in GetFields())`
	`139`	`+ foreach (var fieldInfo in GetFields())`
`140`	`140`	`{`
`141`		`- if (field.IsLiteral)`
	`141`	`+ if (fieldInfo.IsLiteral)`
`142`	`142`	`{`
`143`	`143`	`// Literal fields are ok`
`144`	`144`	`continue;`
`145`	`145`	`}`
`146`	`146`
`147`		`- if (field.IsStatic)`
	`147`	`+ if (fieldInfo.IsStatic)`
`148`	`148`	`{`
`149`	`149`	`return false;`
`150`	`150`	`}`
`151`	`151`
`152`		`- if (field.GetEffectiveVisibility() != EffectiveVisibility.Public)`
	`152`	`+ if (fieldInfo.GetEffectiveVisibility() != EffectiveVisibility.Public)`
`153`	`153`	`{`
`154`	`154`	`return false;`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -472,10 +472,10 @@ public virtual TypeDesc UnderlyingType`
`472`	`472`	`if (!this.IsEnum)`
`473`	`473`	`return this;`
`474`	`474`
`475`		`- foreach (var field in this.GetFields())`
	`475`	`+ foreach (var fieldInfo in this.GetFields())`
`476`	`476`	`{`
`477`		`- if (!field.IsStatic)`
`478`		`- return field.FieldType;`
	`477`	`+ if (!fieldInfo.IsStatic)`
	`478`	`+ return fieldInfo.FieldType;`
`479`	`479`	`}`
`480`	`480`
`481`	`481`	`ThrowHelper.ThrowTypeLoadException(ExceptionStringID.ClassLoadGeneral, this);`
Original file line number	Diff line number	Diff line change
`@@ -464,9 +464,9 @@ public override TypeDesc UnderlyingType`
`464`	`464`
`465`	`465`	`foreach (var handle in _typeDefinition.GetFields())`
`466`	`466`	`{`
`467`		`- var field = _module.GetField(handle, this);`
`468`		`- if (!field.IsStatic)`
`469`		`- return field.FieldType;`
	`467`	`+ var fieldInfo = _module.GetField(handle, this);`
	`468`	`+ if (!fieldInfo.IsStatic)`
	`469`	`+ return fieldInfo.FieldType;`
`470`	`470`	`}`
`471`	`471`
`472`	`472`	`return base.UnderlyingType; // Use the base implementation to get consistent error behavior`
Original file line number	Diff line number	Diff line change
`@@ -553,9 +553,9 @@ private static FieldInfo IsQuotedDomainField`
`553`	`553`	`if (s_isQuotedDomainField == null)`
`554`	`554`	`{`
`555`	`555`	`// TODO https://github.com/dotnet/runtime/issues/19348:`
`556`		`- FieldInfo? field = typeof(Cookie).GetField("IsQuotedDomain", BindingFlags.Instance \| BindingFlags.NonPublic);`
`557`		`- Debug.Assert(field != null, "We need to use an internal field named IsQuotedDomain that is declared on Cookie.");`
`558`		`- s_isQuotedDomainField = field;`
	`556`	`+ FieldInfo? fieldInfo = typeof(Cookie).GetField("IsQuotedDomain", BindingFlags.Instance \| BindingFlags.NonPublic);`
	`557`	`+ Debug.Assert(fieldInfo != null, "We need to use an internal field named IsQuotedDomain that is declared on Cookie.");`
	`558`	`+ s_isQuotedDomainField = fieldInfo;`
`559`	`559`	`}`
`560`	`560`
`561`	`561`	`return s_isQuotedDomainField;`
`@@ -570,9 +570,9 @@ private static FieldInfo IsQuotedVersionField`
`570`	`570`	`if (s_isQuotedVersionField == null)`
`571`	`571`	`{`
`572`	`572`	`// TODO https://github.com/dotnet/runtime/issues/19348:`
`573`		`- FieldInfo? field = typeof(Cookie).GetField("IsQuotedVersion", BindingFlags.Instance \| BindingFlags.NonPublic);`
`574`		`- Debug.Assert(field != null, "We need to use an internal field named IsQuotedVersion that is declared on Cookie.");`
`575`		`- s_isQuotedVersionField = field;`
	`573`	`+ FieldInfo? fieldInfo = typeof(Cookie).GetField("IsQuotedVersion", BindingFlags.Instance \| BindingFlags.NonPublic);`
	`574`	`+ Debug.Assert(fieldInfo != null, "We need to use an internal field named IsQuotedVersion that is declared on Cookie.");`
	`575`	`+ s_isQuotedVersionField = fieldInfo;`
`576`	`576`	`}`
`577`	`577`
`578`	`578`	`return s_isQuotedVersionField;`
Original file line number	Diff line number	Diff line change
`@@ -131,9 +131,9 @@ public bool isStatic`
`131`	`131`	`{`
`132`	`132`	`get`
`133`	`133`	`{`
`134`		`- if (this is FieldSymbol field)`
	`134`	`+ if (this is FieldSymbol fieldInfo)`
`135`	`135`	`{`
`136`		`- return field.isStatic;`
	`136`	`+ return fieldInfo.isStatic;`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`if (this is EventSymbol ev)`
Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,8 @@ internal Type MemberType`
`170`	`170`	`{`
`171`	`171`	`if (_memberType == null)`
`172`	`172`	`{`
`173`		`- if (MemberInfo is FieldInfo field)`
`174`		`- _memberType = field.FieldType;`
	`173`	`+ if (MemberInfo is FieldInfo fieldInfo)`
	`174`	`+ _memberType = fieldInfo.FieldType;`
`175`	`175`	`else if (MemberInfo is PropertyInfo prop)`
`176`	`176`	`_memberType = prop.PropertyType;`
`177`	`177`	`else`
Original file line number	Diff line number	Diff line change
`@@ -431,8 +431,8 @@ internal ConstantModel[] Constants`
`431`	`431`	`FieldInfo[] fields = Type.GetFields();`
`432`	`432`	`for (int i = 0; i < fields.Length; i++)`
`433`	`433`	`{`
`434`		`- FieldInfo field = fields[i];`
`435`		`- ConstantModel? constant = GetConstantModel(field);`
	`434`	`+ FieldInfo fieldInfo = fields[i];`
	`435`	`+ ConstantModel? constant = GetConstantModel(fieldInfo);`
`436`	`436`	`if (constant != null) list.Add(constant);`
`437`	`437`	`}`
`438`	`438`	`_constants = list.ToArray();`
Original file line number	Diff line number	Diff line change
`@@ -792,8 +792,8 @@ public class GenericClassWithVarArgMethod<T>`
`792`	`792`
`793`	`793`	`public T publicField`
`794`	`794`	`{`
`795`		`- get { return field; }`
`796`		`- set { field = value; }`
	`795`	`+ get { return this.field; }`
	`796`	`+ set { this.field = value; }`
`797`	`797`	`}`
`798`	`798`
`799`	`799`	`public T ReturnAndSetField(T newFieldValue, params T[] moreFieldValues)`
`@@ -815,8 +815,8 @@ public class ClassWithVarArgMethod`
`815`	`815`
`816`	`816`	`public int publicField`
`817`	`817`	`{`
`818`		`- get { return field; }`
`819`		`- set { field = value; }`
	`818`	`+ get { return this.field; }`
	`819`	`+ set { this.field = value; }`
`820`	`820`	`}`
`821`	`821`
`822`	`822`	`public int ReturnAndSetField(int newFieldValue, params int[] moreFieldValues)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public AddLambdaCapturingThis()`
`12`	`12`	`field = "abcd";`
`13`	`13`	`}`
`14`	`14`
`15`		`- public string GetField => field;`
	`15`	`+ public string GetField => this.field;`
`16`	`16`
`17`	`17`	`private string field;`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -1057,9 +1057,9 @@ public Type MemberType`
`1057`	`1057`	`{`
`1058`	`1058`	`get`
`1059`	`1059`	`{`
`1060`		`- FieldInfo field = MemberInfo as FieldInfo;`
`1061`		`- if (field != null)`
`1062`		`- return field.FieldType;`
	`1060`	`+ FieldInfo fieldInfo = MemberInfo as FieldInfo;`
	`1061`	`+ if (fieldInfo != null)`
	`1062`	`+ return fieldInfo.FieldType;`
`1063`	`1063`	`return ((PropertyInfo)MemberInfo).PropertyType;`
`1064`	`1064`	`}`
`1065`	`1065`	`}`