Skip to content

Revert "Work around CS9363 for nameof of pointer-typed fields" #130308

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
akoeplinger merged 1 commit into from
Jul 8, 2026
Merged

Revert "Work around CS9363 for nameof of pointer-typed fields" #130308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/libraries/System.Runtime/tests/System.Reflection.Tests/FieldInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ public static IEnumerable<object[]> GetValue_TestData()
yield return new object[] { typeof(MyStruct), nameof(MyStruct.s_stringField), null, "static" };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.s_readonlyStringField), null, "readonlyStatic" };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.s_objectField), null, MyStruct.s_objectField };
yield return new object[] { typeof(MyStruct), "s_intPtr", null, MyStruct.s_intPtrForComparison };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.s_intPtr), null, MyStruct.s_intPtrForComparison };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.s_rvaIntField), null, new int[] { 1, 2, 3 } };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.threadStatic_intField), null, 100 };

yield return new object[] { typeof(MyStruct), nameof(MyStruct.stringField), new MyStruct(), "non static" };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.intField), new MyStruct(), 101 };
yield return new object[] { typeof(MyStruct), "intPtr", new MyStruct(), MyStruct.intPtrForComparison };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.intPtr), new MyStruct(), MyStruct.intPtrForComparison };
yield return new object[] { typeof(MyStruct_OnlyPrimitiveTypes), nameof(MyStruct_OnlyPrimitiveTypes.intField), new MyStruct_OnlyPrimitiveTypes(), 101 };
}

Expand All @@ -107,8 +107,8 @@ public void GetValue(Type type, string name, object obj, object expected)

public static IEnumerable<object[]> GetValue_TestData_WithFunctionPointers()
{
yield return new object[] { typeof(MyStructWithFunctionPointers), "s_fcnPtr", null, (IntPtr)45 };
yield return new object[] { typeof(MyStructWithFunctionPointers), "fcnPtr", new MyStructWithFunctionPointers(), (IntPtr)44 };
yield return new object[] { typeof(MyStructWithFunctionPointers), nameof(MyStructWithFunctionPointers.s_fcnPtr), null, (IntPtr)45 };
yield return new object[] { typeof(MyStructWithFunctionPointers), nameof(MyStructWithFunctionPointers.fcnPtr), new MyStructWithFunctionPointers(), (IntPtr)44 };
}

[Theory]
Expand Down Expand Up @@ -235,15 +235,15 @@ public static IEnumerable<object[]> SetValue_TestData()
yield return new object[] { typeof(MyStruct), nameof(MyStruct.s_intField_Set), null, 1001, 1001 };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.s_stringField_Set), null, "new", "new" };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.s_objectField_Set), null, MyStruct.s_objectField, MyStruct.s_objectField };
yield return new object[] { typeof(MyStruct), "s_intPtr_Set", null, MyStruct.s_intPtrForComparison, MyStruct.s_intPtrForComparison };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.s_intPtr_Set), null, MyStruct.s_intPtrForComparison, MyStruct.s_intPtrForComparison };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.threadStatic_intField_Set), null, 100, 100 };

yield return new object[] { typeof(MyStruct), nameof(MyStruct.boolField), new MyStruct(), true, true };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.boolField), new MyStruct(), false, false };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.intField), new MyStruct(), 1002, 1002 };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.stringField), new MyStruct(), "new", "new" };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.objectField), new MyStruct(), MyStruct.s_objectField, MyStruct.s_objectField };
yield return new object[] { typeof(MyStruct), "intPtr", new MyStruct(), MyStruct.s_intPtrForComparison, MyStruct.s_intPtrForComparison };
yield return new object[] { typeof(MyStruct), nameof(MyStruct.intPtr), new MyStruct(), MyStruct.s_intPtrForComparison, MyStruct.s_intPtrForComparison };
}

[Theory]
Expand All @@ -269,8 +269,8 @@ public void SetValue(Type type, string name, object obj, object value, object ex

public static IEnumerable<object[]> SetValue_TestData_FunctionPointers()
{
yield return new object[] { typeof(MyStructWithFunctionPointers), "s_fcnPtr_Set", null, (IntPtr)201, (IntPtr)201 };
yield return new object[] { typeof(MyStructWithFunctionPointers), "fcnPtr", new MyStructWithFunctionPointers(), (IntPtr)200, (IntPtr)200 };
yield return new object[] { typeof(MyStructWithFunctionPointers), nameof(MyStructWithFunctionPointers.s_fcnPtr_Set), null, (IntPtr)201, (IntPtr)201 };
yield return new object[] { typeof(MyStructWithFunctionPointers), nameof(MyStructWithFunctionPointers.fcnPtr), new MyStructWithFunctionPointers(), (IntPtr)200, (IntPtr)200 };
}

[Theory]
Expand Down
Loading