From 902addd137c6cc948f2a2ca51e9134afa81801a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 7 Jul 2026 17:52:56 +0200 Subject: [PATCH] Revert "Work around CS9363 for nameof of pointer-typed fields" This reverts commit 22c452bf665a1f5218e9791fb844b5cd58ea41ca. The upstream roslyn fix is now in a compiler used by the repo. --- .../System.Reflection.Tests/FieldInfoTests.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libraries/System.Runtime/tests/System.Reflection.Tests/FieldInfoTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/FieldInfoTests.cs index 568cd4f2f8ee8b..f157374f0a5665 100644 --- a/src/libraries/System.Runtime/tests/System.Reflection.Tests/FieldInfoTests.cs +++ b/src/libraries/System.Runtime/tests/System.Reflection.Tests/FieldInfoTests.cs @@ -84,13 +84,13 @@ public static IEnumerable 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 }; } @@ -107,8 +107,8 @@ public void GetValue(Type type, string name, object obj, object expected) public static IEnumerable 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] @@ -235,7 +235,7 @@ public static IEnumerable 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 }; @@ -243,7 +243,7 @@ public static IEnumerable SetValue_TestData() 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] @@ -269,8 +269,8 @@ public void SetValue(Type type, string name, object obj, object value, object ex public static IEnumerable 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]