Add nullable annotations (#1962)

* Add nullable annotations

* Fix generate

Author: slozier

eng/scripts/generate_exceptions.py

@@ -265,7 +265,7 @@ def get_clr_name(e):
     return e.replace('Error', '') + 'Exception'
 
 FACTORY = """
-public static Exception %(name)s(string format, params object[] args) {
+public static Exception %(name)s(string format, params object?[] args) {
     return new %(clrname)s(string.Format(format, args));
 }"""
 

eng/scripts/generate_typecache.py

@@ -74,21 +74,15 @@ def gen_typecache_storage(cw):
             types[x.typeType] = [x]
     for type in types:        
         for a_type in types[type]:
-            cw.write('private static %s %s;' % (type, a_type.name))
+            cw.write('private static %s? %s;' % (type, a_type.name))
 
 # outputs the public getters for each cached type    
 def gen_typecache(cw):
     for x in data:
-        cw.enter_block("public static %s %s" % (x.typeType, x.entryName))
-        cw.enter_block("get")
-        
-        if x.typeType != 'PythonType': cast = '(%s)' % x.typeType
-        else: cast = ""
-        
-        cw.write("if (%s == null) %s = %sDynamicHelpers.GetPythonTypeFromType(typeof(%s));" % (x.name, x.name, cast, x.type))
-        cw.write("return %s;" % x.name)
-        cw.exit_block()
-        cw.exit_block()
+        cw.write("public static %s %s" % (x.typeType, x.entryName))
+        cw.indent()
+        cw.write("=> %s ??= DynamicHelpers.GetPythonTypeFromType(typeof(%s));" % (x.name, x.type))
+        cw.dedent()
         cw.write("")
 
 def main():

src/core/IronPython/Runtime/Binding/BindingWarnings.cs

@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
+#nullable enable
+
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq.Expressions;
-using System.Reflection;
 using System.Threading;
 
 using IronPython.Runtime.Exceptions;
@@ -20,7 +22,7 @@ namespace IronPython.Runtime.Binding {
     /// Provides support for emitting warnings when built in methods are invoked at runtime.
     /// </summary>
     internal static class BindingWarnings {
-        public static bool ShouldWarn(PythonContext/*!*/ context, OverloadInfo/*!*/ method, out WarningInfo info) {
+        public static bool ShouldWarn(PythonContext/*!*/ context, OverloadInfo/*!*/ method, [NotNullWhen(true)] out WarningInfo? info) {
             Assert.NotNull(method);
 
             ObsoleteAttribute[] os = (ObsoleteAttribute[])method.ReflectionInfo.GetCustomAttributes(typeof(ObsoleteAttribute), true);
@@ -39,25 +41,23 @@ public static bool ShouldWarn(PythonContext/*!*/ context, OverloadInfo/*!*/ meth
 
 #if FEATURE_APARTMENTSTATE
             // no apartment states on Silverlight
-            if (method.DeclaringType == typeof(Thread)) {
-                if (method.Name == "Sleep") {
-                    info = new WarningInfo(
-                        PythonExceptions.RuntimeWarning,
-                        "Calling Thread.Sleep on an STA thread doesn't pump messages.  Use Thread.CurrentThread.Join instead.",
-                        Expression.Equal(
-                            Expression.Call(
-                                Expression.Property(
-                                    null,
-                                    typeof(Thread).GetProperty("CurrentThread")
-                                ),
-                                typeof(Thread).GetMethod("GetApartmentState")
+            if (method.DeclaringType == typeof(Thread) && method.Name == nameof(Thread.Sleep)) {
+                info = new WarningInfo(
+                    PythonExceptions.RuntimeWarning,
+                    "Calling Thread.Sleep on an STA thread doesn't pump messages.  Use Thread.CurrentThread.Join instead.",
+                    Expression.Equal(
+                        Expression.Call(
+                            Expression.Property(
+                                null,
+                                typeof(Thread).GetProperty(nameof(Thread.CurrentThread))!
                             ),
-                            AstUtils.Constant(ApartmentState.STA)
-                        )
-                    );
+                            typeof(Thread).GetMethod(nameof(Thread.GetApartmentState))!
+                        ),
+                        AstUtils.Constant(ApartmentState.STA)
+                    )
+                );
 
-                    return true;
-                }
+                return true;
             }
 #endif
 

src/core/IronPython/Runtime/Binding/CompatibilityInvokeBinder.cs

@@ -2,19 +2,11 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
-using System.Linq.Expressions;
+#nullable enable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Dynamic;
 
-using Microsoft.Scripting;
 using Microsoft.Scripting.Actions;
-using Microsoft.Scripting.Actions.Calls;
-using Microsoft.Scripting.Utils;
-
-using IronPython.Runtime.Operations;
 
 using AstUtils = Microsoft.Scripting.Ast.Utils;
 
@@ -32,7 +24,7 @@ public CompatibilityInvokeBinder(PythonContext/*!*/ context, CallInfo /*!*/ call
             _context = context;
         }
 
-        public override DynamicMetaObject/*!*/ FallbackInvoke(DynamicMetaObject target, DynamicMetaObject/*!*/[]/*!*/ args, DynamicMetaObject errorSuggestion) {
+        public override DynamicMetaObject/*!*/ FallbackInvoke(DynamicMetaObject target, DynamicMetaObject/*!*/[]/*!*/ args, DynamicMetaObject? errorSuggestion) {
             if (target.Value is IDynamicMetaObjectProvider && errorSuggestion == null) {
                 // try creating an instance...
                 return target.BindCreateInstance(
@@ -51,7 +43,7 @@ public CompatibilityInvokeBinder(PythonContext/*!*/ context, CallInfo /*!*/ call
             return InvokeFallback(target, args, BindingHelpers.CallInfoToSignature(CallInfo), errorSuggestion);
         }
 
-        internal DynamicMetaObject/*!*/ InvokeFallback(DynamicMetaObject/*!*/ target, DynamicMetaObject/*!*/[]/*!*/ args, CallSignature sig, DynamicMetaObject errorSuggestion) {
+        internal DynamicMetaObject/*!*/ InvokeFallback(DynamicMetaObject/*!*/ target, DynamicMetaObject/*!*/[]/*!*/ args, CallSignature sig, DynamicMetaObject? errorSuggestion) {
             return
                 PythonProtocol.Call(this, target, args) ??
                 Context.Binder.Create(sig, target, args, AstUtils.Constant(_context.SharedContext)) ??
@@ -62,7 +54,7 @@ public override int GetHashCode() {
             return base.GetHashCode() ^ _context.Binder.GetHashCode();
         }
 
-        public override bool Equals(object obj) {
+        public override bool Equals(object? obj) {
             if (!(obj is CompatibilityInvokeBinder ob)) {
                 return false;
             }

src/core/IronPython/Runtime/Binding/ContextArgBuilder.cs

@@ -2,15 +2,12 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
-using System.Linq.Expressions;
+#nullable enable
 
-using System.Collections.Generic;
-using System.Diagnostics;
+using System.Linq.Expressions;
 using System.Reflection;
-using System;
-using System.Dynamic;
+
 using Microsoft.Scripting.Actions.Calls;
-using Microsoft.Scripting.Utils;
 
 namespace IronPython.Runtime.Binding {
 

src/core/IronPython/Runtime/Binding/CreateFallbackBinder.cs

@@ -2,17 +2,9 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
-using System.Linq.Expressions;
+#nullable enable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Dynamic;
-using IronPython.Runtime.Operations;
-using Microsoft.Scripting;
-using Microsoft.Scripting.Actions;
-using Microsoft.Scripting.Utils;
-using AstUtils = Microsoft.Scripting.Ast.Utils;
 
 namespace IronPython.Runtime.Binding {
     /// <summary>
@@ -27,7 +19,7 @@ public CreateFallback(CompatibilityInvokeBinder/*!*/ realFallback, CallInfo /*!*
             _fallback = realFallback;
         }
 
-        public override DynamicMetaObject/*!*/ FallbackCreateInstance(DynamicMetaObject/*!*/ target, DynamicMetaObject/*!*/[]/*!*/ args, DynamicMetaObject errorSuggestion) {
+        public override DynamicMetaObject/*!*/ FallbackCreateInstance(DynamicMetaObject/*!*/ target, DynamicMetaObject/*!*/[]/*!*/ args, DynamicMetaObject? errorSuggestion) {
             return _fallback.InvokeFallback(target, args, BindingHelpers.GetCallSignature(this), errorSuggestion);
         }
 

src/core/IronPython/Runtime/Binding/FastBindResult.cs

@@ -2,17 +2,9 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
-using System.Linq.Expressions;
-
-using System;
-using System.Dynamic;
-using System.Runtime.CompilerServices;
-
-using Microsoft.Scripting.Actions;
+#nullable enable
 
 namespace IronPython.Runtime.Binding {
-    using Ast = Expression;
-
     internal readonly struct FastBindResult<T> where T : class {
         public readonly T Target;
         public readonly bool ShouldCache;

src/core/IronPython/Runtime/Binding/FastGetBase.cs

@@ -39,4 +39,4 @@ protected static object Update(CallSite site, object self, CodeContext context)
             return ((CallSite<Func<CallSite, object, CodeContext, object>>)site).Update(site, self, context);
         }
     }
-}
+}

src/core/IronPython/Runtime/Binding/IComConvertible.cs

@@ -2,10 +2,9 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
+#nullable enable
+
 using System.Dynamic;
-using System.Text;
 
 namespace IronPython.Runtime.Binding {
     /// <summary>

src/core/IronPython/Runtime/Binding/IFastGettable.cs

@@ -2,12 +2,7 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
-using System.Linq.Expressions;
-
-using System;
-using System.Dynamic;
-
-using Microsoft.Scripting.Actions;
+#nullable enable
 
 using System.Runtime.CompilerServices;