Cleanup uses of Interlocked.CompareExchange<object> (#117858)

jkotas · web-flow · commit b3037c614aa1 · 2025-07-20T13:24:51.000-07:00
diff --git a/src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.CoreCLR.cs
@@ -9,6 +9,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
+using System.Threading;
 
 namespace System
 {
@@ -144,7 +145,7 @@ private bool InvocationListEquals(MulticastDelegate d)
 
         private static bool TrySetSlot(object?[] a, int index, object o)
         {
-            if (a[index] == null && Threading.Interlocked.CompareExchange<object?>(ref a[index], o, null) == null)
+            if (a[index] == null && Interlocked.CompareExchange(ref a[index], o, null) == null)
                 return true;
 
             // The slot may be already set because we have added and removed the same method before.
diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs
@@ -34,7 +34,7 @@ internal sealed partial class RuntimeAssembly : Assembly
 
         #endregion
 
-        internal IntPtr GetUnderlyingNativeHandle() { return m_assembly; }
+        internal IntPtr GetUnderlyingNativeHandle() =>  m_assembly;
 
         private sealed class ManifestResourceStream : UnmanagedMemoryStream
         {
@@ -52,17 +52,8 @@ internal unsafe ManifestResourceStream(RuntimeAssembly manifestAssembly, byte* p
             // NOTE: no reason to override Write(Span<byte>), since a ManifestResourceStream is read-only.
         }
 
-        internal object SyncRoot
-        {
-            get
-            {
-                if (m_syncRoot == null)
-                {
-                    Interlocked.CompareExchange<object?>(ref m_syncRoot, new object(), null);
-                }
-                return m_syncRoot;
-            }
-        }
+        internal object SyncRoot =>
+            m_syncRoot ?? Interlocked.CompareExchange(ref m_syncRoot, new object(), null) ?? m_syncRoot;
 
         public override event ModuleResolveEventHandler? ModuleResolve
         {
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Delegate.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Delegate.cs
@@ -9,6 +9,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
+using System.Threading;
 
 using Internal.Reflection.Augments;
 using Internal.Runtime;
@@ -465,7 +466,7 @@ private unsafe Delegate NewMulticastDelegate(Wrapper[] invocationList, int invoc
 
         private static bool TrySetSlot(Wrapper[] a, int index, Delegate o)
         {
-            if (a[index].Value == null && System.Threading.Interlocked.CompareExchange(ref a[index].Value, o, null) == null)
+            if (a[index].Value == null && Interlocked.CompareExchange(ref a[index].Value, o, null) == null)
                 return true;
 
             // The slot may be already set because we have added and removed the same method before.
diff --git a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableDictionary_2.Builder.cs b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableDictionary_2.Builder.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Threading;
 
 namespace System.Collections.Immutable
 {
@@ -56,11 +57,6 @@ public sealed class Builder : IDictionary<TKey, TValue>, IReadOnlyDictionary<TKe
             /// </summary>
             private int _version;
 
-            /// <summary>
-            /// The object callers may use to synchronize access to this collection.
-            /// </summary>
-            private object? _syncRoot;
-
             /// <summary>
             /// Initializes a new instance of the <see cref="ImmutableDictionary{TKey, TValue}.Builder"/> class.
             /// </summary>
@@ -251,18 +247,8 @@ ICollection IDictionary.Values
             /// </summary>
             /// <returns>An object that can be used to synchronize access to the <see cref="ICollection"/>.</returns>
             [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-            object ICollection.SyncRoot
-            {
-                get
-                {
-                    if (_syncRoot == null)
-                    {
-                        Threading.Interlocked.CompareExchange<object?>(ref _syncRoot, new object(), null);
-                    }
-
-                    return _syncRoot;
-                }
-            }
+            object ICollection.SyncRoot =>
+                 field ?? Interlocked.CompareExchange(ref field, new object(), null) ?? field;
 
             /// <summary>
             /// Gets a value indicating whether access to the <see cref="ICollection"/> is synchronized (thread safe).
diff --git a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableList_1.Builder.cs b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableList_1.Builder.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Threading;
 
 namespace System.Collections.Immutable
 {
@@ -46,11 +47,6 @@ public sealed class Builder : IList<T>, IList, IReadOnlyList<T>
             /// </summary>
             private int _version;
 
-            /// <summary>
-            /// The object callers may use to synchronize access to this collection.
-            /// </summary>
-            private object? _syncRoot;
-
             /// <summary>
             /// Initializes a new instance of the <see cref="Builder"/> class.
             /// </summary>
@@ -1159,18 +1155,8 @@ bool ICollection.IsSynchronized
             /// </summary>
             /// <returns>An object that can be used to synchronize access to the <see cref="ICollection"/>.</returns>
             [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-            object ICollection.SyncRoot
-            {
-                get
-                {
-                    if (_syncRoot == null)
-                    {
-                        System.Threading.Interlocked.CompareExchange<object?>(ref _syncRoot, new object(), null);
-                    }
-
-                    return _syncRoot;
-                }
-            }
+            object ICollection.SyncRoot =>
+                 field ?? Interlocked.CompareExchange(ref field, new object(), null) ?? field;
             #endregion
         }
     }
diff --git a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableSortedDictionary_2.Builder.cs b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableSortedDictionary_2.Builder.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Threading;
 
 namespace System.Collections.Immutable
 {
@@ -59,11 +60,6 @@ public sealed class Builder : IDictionary<TKey, TValue>, IReadOnlyDictionary<TKe
             /// </summary>
             private int _version;
 
-            /// <summary>
-            /// The object callers may use to synchronize access to this collection.
-            /// </summary>
-            private object? _syncRoot;
-
             /// <summary>
             /// Initializes a new instance of the <see cref="Builder"/> class.
             /// </summary>
@@ -262,18 +258,8 @@ ICollection IDictionary.Values
             /// </summary>
             /// <returns>An object that can be used to synchronize access to the <see cref="ICollection"/>.</returns>
             [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-            object ICollection.SyncRoot
-            {
-                get
-                {
-                    if (_syncRoot == null)
-                    {
-                        Threading.Interlocked.CompareExchange<object?>(ref _syncRoot, new object(), null);
-                    }
-
-                    return _syncRoot;
-                }
-            }
+            object ICollection.SyncRoot =>
+                 field ?? Interlocked.CompareExchange(ref field, new object(), null) ?? field;
 
             /// <summary>
             /// Gets a value indicating whether access to the <see cref="ICollection"/> is synchronized (thread safe).
diff --git a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableSortedSet_1.Builder.cs b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableSortedSet_1.Builder.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Threading;
 
 namespace System.Collections.Immutable
 {
@@ -51,11 +52,6 @@ public sealed class Builder : IReadOnlyCollection<T>, ISet<T>, ICollection
             /// </summary>
             private int _version;
 
-            /// <summary>
-            /// The object callers may use to synchronize access to this collection.
-            /// </summary>
-            private object? _syncRoot;
-
             /// <summary>
             /// Initializes a new instance of the <see cref="Builder"/> class.
             /// </summary>
@@ -505,18 +501,8 @@ bool ICollection.IsSynchronized
             /// </summary>
             /// <returns>An object that can be used to synchronize access to the <see cref="ICollection"/>.</returns>
             [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-            object ICollection.SyncRoot
-            {
-                get
-                {
-                    if (_syncRoot == null)
-                    {
-                        Threading.Interlocked.CompareExchange<object?>(ref _syncRoot, new object(), null);
-                    }
-
-                    return _syncRoot;
-                }
-            }
+            object ICollection.SyncRoot =>
+                 field ?? Interlocked.CompareExchange(ref field, new object(), null) ?? field;
             #endregion
         }
     }
diff --git a/src/libraries/System.Diagnostics.TraceSource/src/System/Diagnostics/Switch.cs b/src/libraries/System.Diagnostics.TraceSource/src/System/Diagnostics/Switch.cs
@@ -25,25 +25,14 @@ public abstract class Switch
         private bool _initializing;
         private volatile string? _switchValueString = string.Empty;
         private readonly string _defaultValue;
-        private object? _initializedLock;
 
         private static readonly List<WeakReference<Switch>> s_switches = new List<WeakReference<Switch>>();
         private static int s_LastCollectionCount;
         private StringDictionary? _attributes;
 
-        private object InitializedLock
-        {
-            get
-            {
-                if (_initializedLock == null)
-                {
-                    object o = new object();
-                    Interlocked.CompareExchange<object?>(ref _initializedLock, o, null);
-                }
+        private object InitializedLock =>
+            field ?? Interlocked.CompareExchange(ref field, new object(), null) ?? field;
 
-                return _initializedLock;
-            }
-        }
 
         /// <devdoc>
         /// <para>Initializes a new instance of the <see cref='System.Diagnostics.Switch'/>
diff --git a/src/libraries/System.Private.CoreLib/src/System/TimeZone.cs b/src/libraries/System.Private.CoreLib/src/System/TimeZone.cs
@@ -15,19 +15,8 @@ public abstract class TimeZone
         private static volatile TimeZone? currentTimeZone;
 
         // Private object for locking instead of locking on a public type for SQL reliability work.
-        private static object? s_InternalSyncObject;
-        private static object InternalSyncObject
-        {
-            get
-            {
-                if (s_InternalSyncObject == null)
-                {
-                    object o = new object();
-                    Interlocked.CompareExchange<object?>(ref s_InternalSyncObject, o, null);
-                }
-                return s_InternalSyncObject;
-            }
-        }
+        private static object InternalSyncObject =>
+            field ?? Interlocked.CompareExchange(ref field, new object(), null) ?? field;
 
         protected TimeZone()
         {
diff --git a/src/libraries/System.Private.Xml.Linq/src/System/Xml/Linq/XContainer.cs b/src/libraries/System.Private.Xml.Linq/src/System/Xml/Linq/XContainer.cs
@@ -75,7 +75,7 @@ public XNode? LastNode
                     XText t = new XText(s);
                     t.parent = this;
                     t.next = t;
-                    Interlocked.CompareExchange<object>(ref content, t, s);
+                    Interlocked.CompareExchange(ref content, t, s);
                 }
                 return (XNode)content;
             }
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlSchemaSet.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlSchemaSet.cs
@@ -56,20 +56,8 @@ public class XmlSchemaSet
         private XmlSchemaObjectTable? _typeExtensions;
 
         //Thread safety
-        private object? _internalSyncObject;
-        internal object InternalSyncObject
-        {
-            get
-            {
-                if (_internalSyncObject == null)
-                {
-                    object o = new object();
-                    Interlocked.CompareExchange<object?>(ref _internalSyncObject, o, null);
-                }
-
-                return _internalSyncObject;
-            }
-        }
+        internal object InternalSyncObject =>
+            field ?? Interlocked.CompareExchange(ref field, new object(), null) ?? field;
 
         //Constructors
 
diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System/Text/DBCSCodePageEncoding.cs b/src/libraries/System.Text.Encoding.CodePages/src/System/Text/DBCSCodePageEncoding.cs
@@ -225,19 +225,8 @@ protected virtual unsafe void CleanUpEndBytes(char* chars)
         }
 
         // Private object for locking instead of locking on a public type for SQL reliability work.
-        private static object? s_InternalSyncObject;
-        private static object InternalSyncObject
-        {
-            get
-            {
-                if (s_InternalSyncObject == null)
-                {
-                    object o = new object();
-                    Interlocked.CompareExchange<object?>(ref s_InternalSyncObject, o, null);
-                }
-                return s_InternalSyncObject;
-            }
-        }
+        private static object InternalSyncObject =>
+            field ?? Interlocked.CompareExchange(ref field, new object(), null) ?? field;
 
         // Read in our best fit table
         protected override unsafe void ReadBestFitTable()
diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System/Text/DecoderBestFitFallback.cs b/src/libraries/System.Text.Encoding.CodePages/src/System/Text/DecoderBestFitFallback.cs
@@ -47,19 +47,8 @@ internal sealed class InternalDecoderBestFitFallbackBuffer : DecoderFallbackBuff
         private readonly InternalDecoderBestFitFallback _oFallback;
 
         // Private object for locking instead of locking on a public type for SQL reliability work.
-        private static object? s_InternalSyncObject;
-        private static object InternalSyncObject
-        {
-            get
-            {
-                if (s_InternalSyncObject == null)
-                {
-                    object o = new object();
-                    Interlocked.CompareExchange<object?>(ref s_InternalSyncObject, o, null);
-                }
-                return s_InternalSyncObject;
-            }
-        }
+        private static object InternalSyncObject =>
+            field ?? Interlocked.CompareExchange(ref field, new object(), null) ?? field;
 
         // Constructor
         public InternalDecoderBestFitFallbackBuffer(InternalDecoderBestFitFallback fallback)
diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System/Text/EncoderBestFitFallback.cs b/src/libraries/System.Text.Encoding.CodePages/src/System/Text/EncoderBestFitFallback.cs
@@ -47,19 +47,8 @@ internal sealed class InternalEncoderBestFitFallbackBuffer : EncoderFallbackBuff
         private int _iSize;
 
         // Private object for locking instead of locking on a public type for SQL reliability work.
-        private static object? s_InternalSyncObject;
-        private static object InternalSyncObject
-        {
-            get
-            {
-                if (s_InternalSyncObject == null)
-                {
-                    object o = new object();
-                    Interlocked.CompareExchange<object?>(ref s_InternalSyncObject, o, null);
-                }
-                return s_InternalSyncObject;
-            }
-        }
+        private static object InternalSyncObject =>
+            field ?? Interlocked.CompareExchange(ref field, new object(), null) ?? field;
 
         // Constructor
         public InternalEncoderBestFitFallbackBuffer(InternalEncoderBestFitFallback fallback)
diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System/Text/SBCSCodePageEncoding.cs b/src/libraries/System.Text.Encoding.CodePages/src/System/Text/SBCSCodePageEncoding.cs
@@ -129,19 +129,8 @@ protected override unsafe void LoadManagedCodePage()
         }
 
         // Private object for locking instead of locking on a public type for SQL reliability work.
-        private static object? s_InternalSyncObject;
-        private static object InternalSyncObject
-        {
-            get
-            {
-                if (s_InternalSyncObject == null)
-                {
-                    object o = new object();
-                    Interlocked.CompareExchange<object?>(ref s_InternalSyncObject, o, null);
-                }
-                return s_InternalSyncObject;
-            }
-        }
+        private static object InternalSyncObject =>
+            field ?? Interlocked.CompareExchange(ref field, new object(), null) ?? field;
 
         // Read in our best fit table
         protected override unsafe void ReadBestFitTable()

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using System.Runtime.CompilerServices;`
`10`	`10`	`using System.Runtime.InteropServices;`
`11`	`11`	`using System.Runtime.Serialization;`
	`12`	`+using System.Threading;`
`12`	`13`
`13`	`14`	`namespace System`
`14`	`15`	`{`
`@@ -144,7 +145,7 @@ private bool InvocationListEquals(MulticastDelegate d)`
`144`	`145`
`145`	`146`	`private static bool TrySetSlot(object?[] a, int index, object o)`
`146`	`147`	`{`
`147`		`- if (a[index] == null && Threading.Interlocked.CompareExchange<object?>(ref a[index], o, null) == null)`
	`148`	`+ if (a[index] == null && Interlocked.CompareExchange(ref a[index], o, null) == null)`
`148`	`149`	`return true;`
`149`	`150`
`150`	`151`	`// The slot may be already set because we have added and removed the same method before.`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public XNode? LastNode`
`75`	`75`	`XText t = new XText(s);`
`76`	`76`	`t.parent = this;`
`77`	`77`	`t.next = t;`
`78`		`- Interlocked.CompareExchange<object>(ref content, t, s);`
	`78`	`+ Interlocked.CompareExchange(ref content, t, s);`
`79`	`79`	`}`
`80`	`80`	`return (XNode)content;`
`81`	`81`	`}`