Nullable for Type class (dotnet/coreclr#23489)

System.Type, System.Reflection nullability Signed-off-by: dotnet-bot <[email protected]>
Dotnet-GitSync-Bot · May 2, 2019 · 866509a · 866509a
1 parent 3397f83
commit 866509a
Show file tree

Hide file tree

Showing 64 changed files with 511 additions and 470 deletions.
diff --git a/src/System.Private.CoreLib/shared/System/AppDomain.cs b/src/System.Private.CoreLib/shared/System/AppDomain.cs
@@ -399,8 +399,8 @@ public void SetThreadPrincipal(IPrincipal principal)
                     case PrincipalPolicy.UnauthenticatedPrincipal:
                         if (s_getUnauthenticatedPrincipal == null)
                         {
-                            Type type = Type.GetType("System.Security.Principal.GenericPrincipal, System.Security.Claims", throwOnError: true);
-                            MethodInfo mi = type.GetMethod("GetDefaultInstance", BindingFlags.NonPublic | BindingFlags.Static);
+                            Type type = Type.GetType("System.Security.Principal.GenericPrincipal, System.Security.Claims", throwOnError: true)!;
+                            MethodInfo? mi = type.GetMethod("GetDefaultInstance", BindingFlags.NonPublic | BindingFlags.Static);
                             Debug.Assert(mi != null);
                             // Don't throw PNSE if null like for WindowsPrincipal as UnauthenticatedPrincipal should
                             // be available on all platforms.
@@ -414,8 +414,8 @@ public void SetThreadPrincipal(IPrincipal principal)
                     case PrincipalPolicy.WindowsPrincipal:
                         if (s_getWindowsPrincipal == null)
                         {
-                            Type type = Type.GetType("System.Security.Principal.WindowsPrincipal, System.Security.Principal.Windows", throwOnError: true);
-                            MethodInfo mi = type.GetMethod("GetDefaultInstance", BindingFlags.NonPublic | BindingFlags.Static);
+                            Type type = Type.GetType("System.Security.Principal.WindowsPrincipal, System.Security.Principal.Windows", throwOnError: true)!;
+                            MethodInfo? mi = type.GetMethod("GetDefaultInstance", BindingFlags.NonPublic | BindingFlags.Static);
                             if (mi == null)
                             {
                                 throw new PlatformNotSupportedException(SR.PlatformNotSupported_Principal);

diff --git a/src/System.Private.CoreLib/shared/System/Attribute.cs b/src/System.Private.CoreLib/shared/System/Attribute.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#nullable enable
 using System.Diagnostics;
 using System.Reflection;
 
@@ -15,7 +16,7 @@ public abstract partial class Attribute
         protected Attribute() { }
 
 #if !CORERT
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (obj == null)
                 return false;
@@ -25,7 +26,7 @@ public override bool Equals(object obj)
 
             Type thisType = this.GetType();
             object thisObj = this;
-            object thisResult, thatResult;
+            object? thisResult, thatResult;
 
             while (thisType != typeof(Attribute))
             {
@@ -41,7 +42,7 @@ public override bool Equals(object obj)
                         return false;
                     }
                 }
-                thisType = thisType.BaseType;
+                thisType = thisType.BaseType!;
             }
 
             return true;
@@ -54,11 +55,11 @@ public override int GetHashCode()
             while (type != typeof(Attribute))
             {
                 FieldInfo[] fields = type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly);
-                object vThis = null;
+                object? vThis = null;
 
                 for (int i = 0; i < fields.Length; i++)
                 {
-                    object fieldValue = fields[i].GetValue(this);
+                    object? fieldValue = fields[i].GetValue(this);
 
                     // The hashcode of an array ignores the contents of the array, so it can produce 
                     // different hashcodes for arrays with the same contents.
@@ -74,15 +75,15 @@ public override int GetHashCode()
                 if (vThis != null)
                     return vThis.GetHashCode();
 
-                type = type.BaseType;
+                type = type.BaseType!;
             }
 
             return type.GetHashCode();
         }
 #endif
 
         // Compares values of custom-attribute fields.    
-        private static bool AreFieldValuesEqual(object thisValue, object thatValue)
+        private static bool AreFieldValuesEqual(object? thisValue, object? thatValue)
         {
             if (thisValue == null && thatValue == null)
                 return true;
@@ -99,8 +100,8 @@ private static bool AreFieldValuesEqual(object thisValue, object thatValue)
                     return false;
                 }
 
-                Array thisValueArray = thisValue as Array;
-                Array thatValueArray = thatValue as Array;
+                Array thisValueArray = (Array)thisValue;
+                Array thatValueArray = (Array)thatValue;
                 if (thisValueArray.Length != thatValueArray.Length)
                 {
                     return false;
@@ -132,7 +133,7 @@ private static bool AreFieldValuesEqual(object thisValue, object thatValue)
 
         public virtual object TypeId => GetType();
 
-        public virtual bool Match(object obj) => Equals(obj);
+        public virtual bool Match(object? obj) => Equals(obj);
 
         public virtual bool IsDefaultAttribute() => false;
     }

diff --git a/src/System.Private.CoreLib/shared/System/ComponentModel/DefaultValueAttribute.cs b/src/System.Private.CoreLib/shared/System/ComponentModel/DefaultValueAttribute.cs
@@ -68,7 +68,7 @@ bool TryConvertFromInvariantString(Type? typeToConvert, string? stringValue, out
                     // lazy init reflection objects
                     if (s_convertFromInvariantString == null)
                     {
-                        Type typeDescriptorType = Type.GetType("System.ComponentModel.TypeDescriptor, System.ComponentModel.TypeConverter", throwOnError: false);
+                        Type? typeDescriptorType = Type.GetType("System.ComponentModel.TypeDescriptor, System.ComponentModel.TypeConverter", throwOnError: false);
                         MethodInfo? mi = typeDescriptorType?.GetMethod("ConvertFromInvariantString", BindingFlags.NonPublic | BindingFlags.Static);
                         Volatile.Write(ref s_convertFromInvariantString, mi == null ? new object() : mi.CreateDelegate(typeof(Func<Type, string, object>)));
                     }