Make more suitable SPC instance methods static (dotnet#43280)

Co-authored-by: Jan Kotas <[email protected]>

Author: marek-safar

.editorconfig

@@ -159,6 +159,7 @@ csharp_space_between_square_brackets = false
 
 # Analyzers
 dotnet_code_quality.ca1802.api_surface = private, internal
+dotnet_code_quality.ca1822.api_surface = private, internal
 dotnet_code_quality.ca2208.api_surface = public
 
 # License header

src/coreclr/src/System.Private.CoreLib/src/System/Array.CoreCLR.cs

@@ -483,6 +483,7 @@ private unsafe bool IsValueOfElementType(object value)
         public extern void Initialize();
     }
 
+#pragma warning disable CA1822 // Mark members as static
     //----------------------------------------------------------------------------------------
     // ! READ THIS BEFORE YOU WORK ON THIS CLASS.
     //
@@ -619,4 +620,5 @@ private void RemoveAt<T>(int index)
             ThrowHelper.ThrowNotSupportedException(ExceptionResource.NotSupported_FixedSizeCollection);
         }
     }
+#pragma warning restore CA1822
 }

src/coreclr/src/System.Private.CoreLib/src/System/Diagnostics/StackFrame.CoreCLR.cs

@@ -49,6 +49,6 @@ private void BuildStackFrame(int skipFrames, bool needFileInfo)
             }
         }
 
-        private bool AppendStackFrameWithoutMethodBase(StringBuilder sb) => false;
+        private static bool AppendStackFrameWithoutMethodBase(StringBuilder sb) => false;
     }
 }

src/coreclr/src/System.Private.CoreLib/src/System/MulticastDelegate.cs

@@ -153,7 +153,7 @@ private bool InvocationListEquals(MulticastDelegate d)
             return true;
         }
 
-        private bool TrySetSlot(object?[] a, int index, object o)
+        private static bool TrySetSlot(object?[] a, int index, object o)
         {
             if (a[index] == null && System.Threading.Interlocked.CompareExchange<object?>(ref a[index], o, null) == null)
                 return true;
@@ -322,7 +322,7 @@ private object[] DeleteFromInvocationList(object[] invocationList, int invocatio
             return newInvocationList;
         }
 
-        private bool EqualInvocationLists(object[] a, object[] b, int start, int count)
+        private static bool EqualInvocationLists(object[] a, object[] b, int start, int count)
         {
             for (int i = 0; i < count; i++)
             {

src/coreclr/src/System.Private.CoreLib/src/System/Threading/Thread.CoreCLR.cs

@@ -420,7 +420,7 @@ private bool TrySetApartmentStateUnchecked(ApartmentState state)
         [MethodImpl(MethodImplOptions.InternalCall)]
         internal extern int SetApartmentStateNative(int state);
 #else // FEATURE_COMINTEROP_APARTMENT_SUPPORT
-        private bool TrySetApartmentStateUnchecked(ApartmentState state)
+        private static bool TrySetApartmentStateUnchecked(ApartmentState state)
         {
             return state == ApartmentState.Unknown;
         }
@@ -503,10 +503,12 @@ public static int GetCurrentProcessorId()
         // we will record that in a readonly static so that it could become a JIT constant and bypass caching entirely.
         private static readonly bool s_isProcessorNumberReallyFast = ProcessorIdCache.ProcessorNumberSpeedCheck();
 
+#pragma warning disable CA1822 // Mark members as static
         internal void ResetThreadPoolThread()
         {
             // Currently implemented in unmanaged method Thread::InternalReset and
             // called internally from the ThreadPool in NotifyWorkItemComplete.
         }
+#pragma warning restore CA1822
     } // End of class Thread
 }

src/coreclr/src/System.Private.CoreLib/src/System/Utf8String.CoreCLR.cs

@@ -63,6 +63,8 @@ public sealed partial class Utf8String
         [MethodImpl(MethodImplOptions.InternalCall)]
         public extern Utf8String(ReadOnlySpan<byte> value);
 
+#pragma warning disable CA1822 // Mark members as static
+
 #if !CORECLR
         static
 #endif
@@ -262,6 +264,8 @@ private Utf8String Ctor(string value)
             return Ctor(value.AsSpan());
         }
 
+#pragma warning restore CA1822
+
         /*
          * METHODS
          */

src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Suppressions.Shared.xml

@@ -251,7 +251,7 @@
       <argument>ILLink</argument>
       <argument>IL2072</argument>
       <property name="Scope">member</property>
-      <property name="Target">M:System.Diagnostics.Tracing.NullableTypeInfo.WriteData(System.Diagnostics.Tracing.TraceLoggingDataCollector,System.Diagnostics.Tracing.PropertyValue)</property>
+      <property name="Target">M:System.Diagnostics.Tracing.NullableTypeInfo.WriteData(System.Diagnostics.Tracing.PropertyValue)</property>
     </attribute>
     <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
       <argument>ILLink</argument>
@@ -386,4 +386,4 @@
       <property name="Target">M:System.RuntimeType.ForwardCallToInvokeMember(System.String,System.Reflection.BindingFlags,System.Object,System.Object[],System.Boolean[],System.Int32[],System.Type[],System.Type)</property>
     </attribute>
   </assembly>
-</linker>
+</linker>

src/libraries/System.Private.CoreLib/src/System/ByReference.cs

@@ -25,6 +25,7 @@ public ByReference(ref T value)
             throw new PlatformNotSupportedException();
         }
 
+#pragma warning disable CA1822 // Mark members as static
         public ref T Value
         {
             // Implemented as a JIT intrinsic - This default implementation is for
@@ -33,5 +34,6 @@ public ref T Value
             [Intrinsic]
             get => throw new PlatformNotSupportedException();
         }
+#pragma warning restore CA1822
     }
 }

src/libraries/System.Private.CoreLib/src/System/Decimal.DecCalc.cs

@@ -538,7 +538,7 @@ private static void IncreaseScale64(ref Buf12 bufNum, uint power)
             /// <returns>Returns new scale factor. bufRes updated in place, always 3 uints.</returns>
             private static unsafe int ScaleResult(Buf24* bufRes, uint hiRes, int scale)
             {
-                Debug.Assert(hiRes < bufRes->Length);
+                Debug.Assert(hiRes < Buf24.Length);
                 uint* result = (uint*)bufRes;
 
                 // See if we need to scale the result.  The combined scale must
@@ -666,7 +666,7 @@ private static unsafe int ScaleResult(Buf24* bufRes, uint hiRes, int scale)
                             uint cur = 0;
                             do
                             {
-                                Debug.Assert(cur + 1 < bufRes->Length);
+                                Debug.Assert(cur + 1 < Buf24.Length);
                             }
                             while (++result[++cur] == 0);
 
@@ -1007,7 +1007,7 @@ internal static unsafe void DecAddSub(ref DecCalc d1, ref DecCalc d2, bool sign)
                         uint* rgulNum = (uint*)&bufNum;
                         for (uint cur = 0; ;)
                         {
-                            Debug.Assert(cur < bufNum.Length);
+                            Debug.Assert(cur < Buf24.Length);
                             tmp64 += UInt32x32To64(rgulNum[cur], power);
                             rgulNum[cur] = (uint)tmp64;
                             cur++;
@@ -1019,7 +1019,7 @@ internal static unsafe void DecAddSub(ref DecCalc d1, ref DecCalc d2, bool sign)
                         if ((uint)tmp64 != 0)
                         {
                             // We're extending the result by another uint.
-                            Debug.Assert(hiProd + 1 < bufNum.Length);
+                            Debug.Assert(hiProd + 1 < Buf24.Length);
                             rgulNum[++hiProd] = (uint)tmp64;
                         }
                     }
@@ -1055,9 +1055,9 @@ internal static unsafe void DecAddSub(ref DecCalc d1, ref DecCalc d2, bool sign)
                         uint cur = 3;
                         do
                         {
-                            Debug.Assert(cur < bufNum.Length);
+                            Debug.Assert(cur < Buf24.Length);
                         } while (number[cur++]-- == 0);
-                        Debug.Assert(hiProd < bufNum.Length);
+                        Debug.Assert(hiProd < Buf24.Length);
                         if (number[hiProd] == 0 && --hiProd <= 2)
                             goto ReturnResult;
                     }
@@ -1082,7 +1082,7 @@ internal static unsafe void DecAddSub(ref DecCalc d1, ref DecCalc d2, bool sign)
                         uint* number = (uint*)&bufNum;
                         for (uint cur = 3; ++number[cur++] == 0;)
                         {
-                            Debug.Assert(cur < bufNum.Length);
+                            Debug.Assert(cur < Buf24.Length);
                             if (hiProd < cur)
                             {
                                 number[cur] = 1;
@@ -2327,7 +2327,7 @@ private static unsafe void VarDecModFull(ref DecCalc d1, ref DecCalc d2, int sca
                     // The high bit of the dividend must not be set.
                     if (tmp64 > int.MaxValue)
                     {
-                        Debug.Assert(high + 1 < b.Length);
+                        Debug.Assert(high + 1 < Buf28.Length);
                         buf[++high] = (uint)(tmp64 >> 32);
                     }
 
@@ -2683,15 +2683,15 @@ public ulong High64
 #endif
                 }
 
-                public int Length => 6;
+                public const int Length = 6;
             }
 
             private struct Buf28
             {
                 public Buf24 Buf24;
                 public uint U6;
 
-                public int Length => 7;
+                public const int Length = 7;
             }
         }
     }

src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventProvider.cs

@@ -600,7 +600,11 @@ private static int IndexOfSessionInList(List<SessionInfo>? sessions, int etwSess
         /// returns an array of bytes representing the data, the index into that byte array where the data
         /// starts, and the command being issued associated with that data.
         /// </summary>
-        private unsafe bool GetDataFromController(int etwSessionId,
+        private
+#if !TARGET_WINDOWS
+        static
+#endif
+        unsafe bool GetDataFromController(int etwSessionId,
             Interop.Advapi32.EVENT_FILTER_DESCRIPTOR* filterData, out ControllerCommand command, out byte[]? data, out int dataStart)
         {
             data = null;

src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/ArrayTypeInfo.cs

@@ -32,9 +32,9 @@ public override void WriteMetadata(
             collector.EndBufferedArray();
         }
 
-        public override void WriteData(TraceLoggingDataCollector collector, PropertyValue value)
+        public override void WriteData(PropertyValue value)
         {
-            int bookmark = collector.BeginBufferedArray();
+            int bookmark = TraceLoggingDataCollector.BeginBufferedArray();
 
             int count = 0;
             Array? array = (Array?)value.ReferenceValue;
@@ -43,11 +43,11 @@ public override void WriteData(TraceLoggingDataCollector collector, PropertyValu
                 count = array.Length;
                 for (int i = 0; i < array.Length; i++)
                 {
-                    this.elementInfo.WriteData(collector, elementInfo.PropertyValueFactory(array.GetValue(i)));
+                    this.elementInfo.WriteData(elementInfo.PropertyValueFactory(array.GetValue(i)));
                 }
             }
 
-            collector.EndBufferedArray(bookmark, count);
+            TraceLoggingDataCollector.EndBufferedArray(bookmark, count);
         }
 
         public override object? GetData(object? value)

src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/EnumerableTypeInfo.cs

@@ -36,22 +36,22 @@ public override void WriteMetadata(
             collector.EndBufferedArray();
         }
 
-        public override void WriteData(TraceLoggingDataCollector collector, PropertyValue value)
+        public override void WriteData(PropertyValue value)
         {
-            int bookmark = collector.BeginBufferedArray();
+            int bookmark = TraceLoggingDataCollector.BeginBufferedArray();
 
             int count = 0;
             IEnumerable? enumerable = (IEnumerable?)value.ReferenceValue;
             if (enumerable != null)
             {
                 foreach (object? element in enumerable)
                 {
-                    this.elementInfo.WriteData(collector, elementInfo.PropertyValueFactory(element));
+                    this.elementInfo.WriteData(elementInfo.PropertyValueFactory(element));
                     count++;
                 }
             }
 
-            collector.EndBufferedArray(bookmark, count);
+            TraceLoggingDataCollector.EndBufferedArray(bookmark, count);
         }
 
         public override object? GetData(object? value)

src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/InvokeTypeInfo.cs

@@ -62,13 +62,13 @@ public override void WriteMetadata(
             }
         }
 
-        public override void WriteData(TraceLoggingDataCollector collector, PropertyValue value)
+        public override void WriteData(PropertyValue value)
         {
             if (this.properties != null)
             {
                 foreach (PropertyAnalysis property in this.properties)
                 {
-                    property.typeInfo.WriteData(collector, property.getter(value));
+                    property.typeInfo.WriteData(property.getter(value));
                 }
             }
         }

src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/PropertyValue.cs

@@ -205,7 +205,7 @@ private abstract class TypeHelper
         {
             public abstract Func<PropertyValue, PropertyValue> GetPropertyGetter(PropertyInfo property);
 
-            protected Delegate GetGetMethod(PropertyInfo property, Type propertyType)
+            protected static Delegate GetGetMethod(PropertyInfo property, Type propertyType)
             {
                 return property.GetMethod!.CreateDelegate(typeof(Func<,>).MakeGenericType(property.DeclaringType!, propertyType));
             }