Enable new analyzers CA1510/11/12/13 and CA1856/57/58

eng/CodeAnalysis.src.globalconfig

@@ -238,6 +238,18 @@ dotnet_diagnostic.CA1508.severity = none
 # CA1509: Invalid entry in code metrics rule specification file
 dotnet_diagnostic.CA1509.severity = none
 
+# CA1510: Use ArgumentNullException throw helper
+dotnet_diagnostic.CA1510.severity = warning
+
+# CA1511: Use ArgumentException throw helper
+dotnet_diagnostic.CA1511.severity = warning
+
+# CA1512: Use ArgumentOutOfRangeException throw helper
+dotnet_diagnostic.CA1512.severity = warning
+
+# CA1513: Use ObjectDisposedException throw helper
+dotnet_diagnostic.CA1513.severity = warning
+
 # CA1700: Do not name enum values 'Reserved'
 dotnet_diagnostic.CA1700.severity = none
 
@@ -420,6 +432,15 @@ dotnet_diagnostic.CA1854.severity = warning
 # CA1855: Prefer 'Clear' over 'Fill'
 dotnet_diagnostic.CA1855.severity = warning
 
+# CA1856: Incorrect usage of ConstantExpected attribute
+dotnet_diagnostic.CA1856.severity = error
+
+# CA1857: A constant is expected for the parameter
+dotnet_diagnostic.CA1857.severity = warning
+
+# CA1858: Use 'StartsWith' instead of 'IndexOf'
+dotnet_diagnostic.CA1858.severity = warning
+
 # CA2000: Dispose objects before losing scope
 dotnet_diagnostic.CA2000.severity = none
 
@@ -471,9 +492,6 @@ dotnet_diagnostic.CA2100.severity = none
 # CA2101: Specify marshaling for P/Invoke string arguments
 dotnet_diagnostic.CA2101.severity = none
 
-# CA2109: Review visible event handlers
-dotnet_diagnostic.CA2109.severity = none
-
 # CA2119: Seal methods that satisfy private interfaces
 dotnet_diagnostic.CA2119.severity = none
 

eng/CodeAnalysis.test.globalconfig

@@ -237,6 +237,18 @@ dotnet_diagnostic.CA1508.severity = none
 # CA1509: Invalid entry in code metrics rule specification file
 dotnet_diagnostic.CA1509.severity = none
 
+# CA1510: Use ArgumentNullException throw helper
+dotnet_diagnostic.CA1510.severity = none
+
+# CA1511: Use ArgumentException throw helper
+dotnet_diagnostic.CA1511.severity = none
+
+# CA1512: Use ArgumentOutOfRangeException throw helper
+dotnet_diagnostic.CA1512.severity = none
+
+# CA1513: Use ObjectDisposedException throw helper
+dotnet_diagnostic.CA1513.severity = none
+
 # CA1700: Do not name enum values 'Reserved'
 dotnet_diagnostic.CA1700.severity = none
 
@@ -417,6 +429,15 @@ dotnet_diagnostic.CA1854.severity = none
 # CA1855: Prefer 'Clear' over 'Fill'
 dotnet_diagnostic.CA1855.severity = none
 
+# CA1856: Incorrect usage of ConstantExpected attribute
+dotnet_diagnostic.CA1856.severity = none
+
+# CA1857: A constant is expected for the parameter
+dotnet_diagnostic.CA1857.severity = none
+
+# CA1858: Use 'StartsWith' instead of 'IndexOf'
+dotnet_diagnostic.CA1858.severity = none
+
 # CA2000: Dispose objects before losing scope
 dotnet_diagnostic.CA2000.severity = none
 
@@ -468,9 +489,6 @@ dotnet_diagnostic.CA2100.severity = none
 # CA2101: Specify marshaling for P/Invoke string arguments
 dotnet_diagnostic.CA2101.severity = none
 
-# CA2109: Review visible event handlers
-dotnet_diagnostic.CA2109.severity = none
-
 # CA2119: Seal methods that satisfy private interfaces
 dotnet_diagnostic.CA2119.severity = none
 

src/coreclr/nativeaot/Common/src/System/Collections/Generic/LowLevelList.cs

@@ -62,7 +62,7 @@ public LowLevelList()
         //
         public LowLevelList(int capacity)
         {
-            if (capacity < 0) throw new ArgumentOutOfRangeException(nameof(capacity));
+            ArgumentOutOfRangeException.ThrowIfNegative(capacity);
 
             if (capacity == 0)
                 _items = s_emptyArray;
@@ -76,8 +76,7 @@ public LowLevelList(int capacity)
         //
         public LowLevelList(IEnumerable<T> collection)
         {
-            if (collection == null)
-                throw new ArgumentNullException(nameof(collection));
+            ArgumentNullException.ThrowIfNull(collection);
 
             ICollection<T>? c = collection as ICollection<T>;
             if (c != null)
@@ -123,10 +122,7 @@ public int Capacity
             }
             set
             {
-                if (value < _size)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(value));
-                }
+                ArgumentOutOfRangeException.ThrowIfLessThan(value, _size);
 
                 if (value != _items.Length)
                 {
@@ -160,19 +156,13 @@ public T this[int index]
             get
             {
                 // Following trick can reduce the range check by one
-                if ((uint)index >= (uint)_size)
-                {
-                    throw new ArgumentOutOfRangeException();
-                }
+                ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)_size, nameof(index));
                 return _items[index];
             }
 
             set
             {
-                if ((uint)index >= (uint)_size)
-                {
-                    throw new ArgumentOutOfRangeException();
-                }
+                ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)_size, nameof(index));
                 _items[index] = value;
                 _version++;
             }
@@ -298,8 +288,7 @@ public int IndexOf(T item)
         //
         public int IndexOf(T item, int index)
         {
-            if (index > _size)
-                throw new ArgumentOutOfRangeException(nameof(index));
+            ArgumentOutOfRangeException.ThrowIfGreaterThan(index, _size);
             return Array.IndexOf(_items, item, index, _size - index);
         }
 
@@ -310,10 +299,8 @@ public int IndexOf(T item, int index)
         public void Insert(int index, T item)
         {
             // Note that insertions at the end are legal.
-            if ((uint)index > (uint)_size)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index));
-            }
+            ArgumentOutOfRangeException.ThrowIfGreaterThan((uint)index, (uint)_size, nameof(index));
+
             if (_size == _items.Length) EnsureCapacity(_size + 1);
             if (index < _size)
             {
@@ -331,15 +318,8 @@ public void Insert(int index, T item)
         //
         public void InsertRange(int index, IEnumerable<T> collection)
         {
-            if (collection == null)
-            {
-                throw new ArgumentNullException(nameof(collection));
-            }
-
-            if ((uint)index > (uint)_size)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index));
-            }
+            ArgumentNullException.ThrowIfNull(collection);
+            ArgumentOutOfRangeException.ThrowIfGreaterThan((uint)index, (uint)_size, nameof(index));
 
             ICollection<T>? c = collection as ICollection<T>;
             if (c != null)
@@ -402,10 +382,7 @@ public bool Remove(T item)
         // The complexity is O(n).
         public int RemoveAll(Predicate<T> match)
         {
-            if (match == null)
-            {
-                throw new ArgumentNullException(nameof(match));
-            }
+            ArgumentNullException.ThrowIfNull(match);
 
             int freeIndex = 0;   // the first free slot in items array
 
@@ -438,10 +415,7 @@ public int RemoveAll(Predicate<T> match)
         //
         public void RemoveAt(int index)
         {
-            if ((uint)index >= (uint)_size)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index));
-            }
+            ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)_size, nameof(index));
             _size--;
             if (index < _size)
             {

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Reflection/Core/Execution/ExecutionDomain.cs

@@ -41,8 +41,7 @@ internal ExecutionDomain(ReflectionDomainSetup executionDomainSetup, ExecutionEn
         //
         public Type GetType(string typeName, Func<AssemblyName, Assembly> assemblyResolver, Func<Assembly, string, bool, Type> typeResolver, bool throwOnError, bool ignoreCase, IList<string> defaultAssemblyNames)
         {
-            if (typeName == null)
-                throw new ArgumentNullException(nameof(typeName));
+            ArgumentNullException.ThrowIfNull(typeName);
 
             if (typeName.Length == 0)
             {

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Reflection/Extensions/NonPortable/CustomAttributeInheritanceRules.cs

@@ -72,8 +72,7 @@ public static IEnumerable<CustomAttributeData> GetMatchingCustomAttributes(this
                     return EventCustomAttributeSearcher.Default.GetMatchingCustomAttributes(eventInfo, optionalAttributeTypeFilter, inherit, skipTypeValidation: skipTypeValidation);
             }
 
-            if (element == null)
-                throw new ArgumentNullException();
+            ArgumentNullException.ThrowIfNull(element);
 
             throw new NotSupportedException(); // Shouldn't get here.
         }

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Reflection/Extensions/NonPortable/CustomAttributeSearcher.cs

@@ -33,14 +33,12 @@ public IEnumerable<CustomAttributeData> GetMatchingCustomAttributes(E element, T
         {
             // Do all parameter validation here before we enter the iterator function (so that exceptions from validations
             // show up immediately rather than on the first MoveNext()).
-            if (element == null)
-                throw new ArgumentNullException(nameof(element));
+            ArgumentNullException.ThrowIfNull(element);
 
             bool typeFilterKnownToBeSealed = false;
             if (!skipTypeValidation)
             {
-                if (optionalAttributeTypeFilter == null)
-                    throw new ArgumentNullException("type");
+                ArgumentNullException.ThrowIfNull(optionalAttributeTypeFilter, "type");
                 if (!(optionalAttributeTypeFilter == typeof(Attribute) ||
                       optionalAttributeTypeFilter.IsSubclassOf(typeof(Attribute))))
                     throw new ArgumentException(SR.Argument_MustHaveAttributeBaseClass);

src/coreclr/nativeaot/System.Private.CoreLib/src/System/ActivatorImplementation.cs

@@ -19,8 +19,7 @@ public static object CreateInstance(
             [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
             Type type, bool nonPublic)
         {
-            if (type == null)
-                throw new ArgumentNullException(nameof(type));
+            ArgumentNullException.ThrowIfNull(type);
 
             type = type.UnderlyingSystemType;
             CreateInstanceCheckType(type);
@@ -46,8 +45,7 @@ public static object CreateInstance(
             [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
             Type type, BindingFlags bindingAttr, Binder binder, object?[]? args, CultureInfo? culture, object?[]? activationAttributes)
         {
-            if (type == null)
-                throw new ArgumentNullException(nameof(type));
+            ArgumentNullException.ThrowIfNull(type);
 
             // If they didn't specify a lookup, then we will provide the default lookup.
             const BindingFlags LookupMask = (BindingFlags)0x000000FF;

src/coreclr/nativeaot/System.Private.CoreLib/src/System/GC.NativeAot.cs

@@ -65,10 +65,7 @@ public static partial class GC
     {
         public static int GetGeneration(object obj)
         {
-            if (obj == null)
-            {
-                throw new ArgumentNullException(nameof(obj));
-            }
+            ArgumentNullException.ThrowIfNull(obj);
 
             return RuntimeImports.RhGetGeneration(obj);
         }
@@ -389,18 +386,14 @@ public static void WaitForPendingFinalizers()
 
         public static void SuppressFinalize(object obj)
         {
-            if (obj == null)
-            {
-                throw new ArgumentNullException(nameof(obj));
-            }
+            ArgumentNullException.ThrowIfNull(obj);
 
             RuntimeImports.RhSuppressFinalize(obj);
         }
 
         public static void ReRegisterForFinalize(object obj)
         {
-            if (obj == null)
-                throw new ArgumentNullException(nameof(obj));
+            ArgumentNullException.ThrowIfNull(obj);
 
             RuntimeImports.RhReRegisterForFinalize(obj);
         }

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Assembly.NativeAot.cs

@@ -29,8 +29,7 @@ public static Assembly GetCallingAssembly()
 
         public static Assembly Load(string assemblyString)
         {
-            if (assemblyString == null)
-                throw new ArgumentNullException(nameof(assemblyString));
+            ArgumentNullException.ThrowIfNull(assemblyString);
 
             AssemblyName name = new AssemblyName(assemblyString);
             return Load(name);
@@ -39,8 +38,7 @@ public static Assembly Load(string assemblyString)
         [Obsolete("Assembly.LoadWithPartialName has been deprecated. Use Assembly.Load() instead.")]
         public static Assembly LoadWithPartialName(string partialName)
         {
-            if (partialName == null)
-                throw new ArgumentNullException(nameof(partialName));
+            ArgumentNullException.ThrowIfNull(partialName);
 
             if ((partialName.Length == 0) || (partialName[0] == '\0'))
                 throw new ArgumentException(SR.Format_StringZeroLength, nameof(partialName));

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Metadata/AssemblyExtensions.cs

@@ -18,10 +18,7 @@ public static class AssemblyExtensions
         [CLSCompliant(false)] // out byte* blob
         public static unsafe bool TryGetRawMetadata(this Assembly assembly, out byte* blob, out int length)
         {
-            if (assembly == null)
-            {
-                throw new ArgumentNullException(nameof(assembly));
-            }
+            ArgumentNullException.ThrowIfNull(assembly);
 
             blob = null;
             length = 0;

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/Assemblies/RuntimeAssemblyInfo.cs

@@ -71,10 +71,7 @@ public sealed override Module GetModule(string name)
         [RequiresUnreferencedCode("Types might be removed")]
         public sealed override Type GetType(string name, bool throwOnError, bool ignoreCase)
         {
-            if (name == null)
-                throw new ArgumentNullException();
-            if (name.Length == 0)
-                throw new ArgumentException();
+            ArgumentException.ThrowIfNullOrEmpty(name);
 
             TypeName typeName = TypeParser.ParseAssemblyQualifiedTypeName(name, throwOnError: throwOnError);
             if (typeName == null)

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/EventInfos/NativeFormat/NativeFormatRuntimeEventInfo.cs

@@ -103,8 +103,7 @@ public sealed override IEnumerable<CustomAttributeData> CustomAttributes
 
         public sealed override bool HasSameMetadataDefinitionAs(MemberInfo other)
         {
-            if (other == null)
-                throw new ArgumentNullException(nameof(other));
+            ArgumentNullException.ThrowIfNull(other);
 
             if (!(other is NativeFormatRuntimeEventInfo otherEvent))
                 return false;

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/FieldInfos/NativeFormat/NativeFormatRuntimeFieldInfo.cs

@@ -94,8 +94,7 @@ public sealed override string ToString()
 
         public sealed override bool HasSameMetadataDefinitionAs(MemberInfo other)
         {
-            if (other == null)
-                throw new ArgumentNullException(nameof(other));
+            ArgumentNullException.ThrowIfNull(other);
 
             if (!(other is NativeFormatRuntimeFieldInfo otherField))
                 return false;