pythonnet · lostmsu · Dec 15, 2021 · Dec 15, 2021
diff --git a/src/runtime/Codecs/DecoderGroup.cs b/src/runtime/Codecs/DecoderGroup.cs
@@ -30,7 +30,7 @@ public void Add(IPyObjectDecoder item)
         public bool CanDecode(PyType objectType, Type targetType)
             => this.decoders.Any(decoder => decoder.CanDecode(objectType, targetType));
         /// <inheritdoc />
-        public bool TryDecode<T>(PyObject pyObj, out T value)
+        public bool TryDecode<T>(PyObject pyObj, out T? value)
         {
             if (pyObj is null) throw new ArgumentNullException(nameof(pyObj));
 
@@ -65,7 +65,7 @@ public static class DecoderGroupExtensions
         /// that can decode from <paramref name="objectType"/> to <paramref name="targetType"/>,
         /// or <c>null</c> if a matching decoder can not be found.
         /// </summary>
-        public static IPyObjectDecoder GetDecoder(
+        public static IPyObjectDecoder? GetDecoder(
             this IPyObjectDecoder decoder,
             PyType objectType, Type targetType)
         {

diff --git a/src/runtime/Codecs/EncoderGroup.cs b/src/runtime/Codecs/EncoderGroup.cs
@@ -28,7 +28,7 @@ public void Add(IPyObjectEncoder item)
         /// <inheritdoc />
         public bool CanEncode(Type type) => this.encoders.Any(encoder => encoder.CanEncode(type));
         /// <inheritdoc />
-        public PyObject TryEncode(object value)
+        public PyObject? TryEncode(object value)
         {
             if (value is null) throw new ArgumentNullException(nameof(value));
 

diff --git a/src/runtime/CollectionWrappers/IterableWrapper.cs b/src/runtime/CollectionWrappers/IterableWrapper.cs
@@ -35,7 +35,7 @@ public IEnumerator<T> GetEnumerator()
                     iterObject.Dispose();
                     break;
                 }
-                yield return iterObject.Current.As<T>();
+                yield return iterObject.Current.As<T>()!;
             }
         }
     }

diff --git a/src/runtime/CollectionWrappers/ListWrapper.cs b/src/runtime/CollectionWrappers/ListWrapper.cs
@@ -16,7 +16,7 @@ public T this[int index]
             {
                 var item = Runtime.PyList_GetItem(pyObject, index);
                 var pyItem = new PyObject(item);
-                return pyItem.As<T>();
+                return pyItem.As<T>()!;
             }
             set
             {

diff --git a/src/runtime/CustomMarshaler.cs b/src/runtime/CustomMarshaler.cs
@@ -74,7 +74,7 @@ public static ICustomMarshaler GetInstance(string cookie)
             return Instance;
         }
 
-        public static string PtrToStringUni(IntPtr p)
+        public static string? PtrToStringUni(IntPtr p)
         {
             if (p == IntPtr.Zero)
             {
@@ -134,7 +134,7 @@ public static IntPtr Py3UnicodePy2StringtoPtr(string s)
         /// <returns>
         /// Managed String
         /// </returns>
-        public static string PtrToPy3UnicodePy2String(IntPtr p)
+        public static string? PtrToPy3UnicodePy2String(IntPtr p)
         {
             return PtrToStringUni(p);
         }
@@ -184,7 +184,7 @@ public override IntPtr MarshalManagedToNative(object managedObj)
             return mem;
         }
 
-        public static ICustomMarshaler GetInstance(string cookie)
+        public static ICustomMarshaler GetInstance(string? cookie)
         {
             return Instance;
         }

diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj
@@ -60,7 +60,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Lost.Compat.NullabilityAttributes" Version="0.0.4" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/runtime/ReflectedClrType.cs b/src/runtime/ReflectedClrType.cs
@@ -53,7 +53,9 @@ internal void Restore(InterDomainContext context)
     {
         var cb = context.Storage.GetValue<ClassBase>("impl");
 
-        cb.Load(this, context);
+        Debug.Assert(cb is not null);
+
+        cb!.Load(this, context);
 
         Restore(cb);
     }

diff --git a/src/runtime/StateSerialization/CLRWrapperCollection.cs b/src/runtime/StateSerialization/CLRWrapperCollection.cs
@@ -1,10 +1,11 @@
 using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Python.Runtime;
 
 public class CLRWrapperCollection : KeyedCollection<object, CLRMappedItem>
 {
-    public bool TryGetValue(object key, out CLRMappedItem value)
+    public bool TryGetValue(object key, [NotNullWhen(true)] out CLRMappedItem? value)
     {
         if (Dictionary == null)
         {

diff --git a/src/runtime/StateSerialization/ClassManagerState.cs b/src/runtime/StateSerialization/ClassManagerState.cs
@@ -3,6 +3,10 @@
 
 namespace Python.Runtime.StateSerialization;
 
+// Workaround for the lack of required properties: https://github.com/dotnet/csharplang/issues/3630
+// Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+#pragma warning disable CS8618
+
 [Serializable]
 internal class ClassManagerState
 {

diff --git a/src/runtime/StateSerialization/ImportHookState.cs b/src/runtime/StateSerialization/ImportHookState.cs
@@ -3,10 +3,14 @@
 
 namespace Python.Runtime.StateSerialization;
 
+// Workaround for the lack of required properties: https://github.com/dotnet/csharplang/issues/3630
+// Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+#pragma warning disable CS8618
+
 [Serializable]
 internal class ImportHookState
 {
-    public PyModule PyCLRModule { get; set; }
-    public PyObject Root { get; set; }
-    public Dictionary<PyString, PyObject> Modules { get; set; }
+    public PyModule PyCLRModule { get; init; }
+    public PyObject Root { get; init; }
+    public Dictionary<PyString, PyObject> Modules { get; init; }
 }
diff --git a/src/runtime/StateSerialization/MaybeMemberInfo.cs b/src/runtime/StateSerialization/MaybeMemberInfo.cs
@@ -7,8 +7,6 @@ namespace Python.Runtime
     [Serializable]
     internal struct MaybeMemberInfo<T> : ISerializable where T : MemberInfo
     {
-        public static implicit operator MaybeMemberInfo<T>(T ob) => new MaybeMemberInfo<T>(ob);
-
         // .ToString() of the serialized object
         const string SerializationDescription = "d";
         // The ReflectedType of the object
@@ -50,8 +48,8 @@ public override string ToString()
         public MaybeMemberInfo(T fi)
         {
             info = fi;
-            Description = info?.ToString();
-            if (info?.DeclaringType is not null)
+            Description = info.ToString();
+            if (info.DeclaringType is not null)
                 Description += " of " + info.DeclaringType;
             deserializationException = null;
         }

diff --git a/src/runtime/StateSerialization/MaybeMethodBase.cs b/src/runtime/StateSerialization/MaybeMethodBase.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Linq;
@@ -21,7 +22,7 @@ internal struct MaybeMethodBase<T> : ISerializable where T: MethodBase
 
         public static implicit operator MaybeMethodBase<T> (T? ob) => new (ob);
 
-        string name;
+        string? name;
         MethodBase? info;
 
         [NonSerialized]
@@ -48,7 +49,8 @@ public T Value
         }
 
         public T UnsafeValue => (T)info!;
-        public string Name {get{return name;}}
+        public string? Name => name;
+        [MemberNotNullWhen(true, nameof(info))]
         public bool Valid => info != null;
 
         public override string ToString()

diff --git a/src/runtime/StateSerialization/MetatypeState.cs b/src/runtime/StateSerialization/MetatypeState.cs
@@ -2,6 +2,10 @@
 
 namespace Python.Runtime.StateSerialization;
 
+// Workaround for the lack of required properties: https://github.com/dotnet/csharplang/issues/3630
+// Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+#pragma warning disable CS8618
+
 [Serializable]
 internal class MetatypeState
 {

diff --git a/src/runtime/StateSerialization/PythonNetState.cs b/src/runtime/StateSerialization/PythonNetState.cs
@@ -2,12 +2,16 @@
 
 namespace Python.Runtime.StateSerialization;
 
+// Workaround for the lack of required properties: https://github.com/dotnet/csharplang/issues/3630
+// Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+#pragma warning disable CS8618
+
 [Serializable]
 internal class PythonNetState
 {
-    public MetatypeState Metatype { get; set; }
-    public SharedObjectsState SharedObjects { get; set; }
-    public TypeManagerState Types { get; set; }
-    public ClassManagerState Classes { get; set; }
-    public ImportHookState ImportHookState { get; set; }
+    public MetatypeState Metatype { get; init; }
+    public SharedObjectsState SharedObjects { get; init; }
+    public TypeManagerState Types { get; init; }
+    public ClassManagerState Classes { get; init; }
+    public ImportHookState ImportHookState { get; init; }
 }
diff --git a/src/runtime/StateSerialization/SharedObjectsState.cs b/src/runtime/StateSerialization/SharedObjectsState.cs
@@ -3,11 +3,15 @@
 
 namespace Python.Runtime.StateSerialization;
 
+// Workaround for the lack of required properties: https://github.com/dotnet/csharplang/issues/3630
+// Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+#pragma warning disable CS8618
+
 [Serializable]
 internal class SharedObjectsState
 {
-    public Dictionary<PyObject, CLRObject> InternalStores { get; set; }
-    public Dictionary<PyObject, ExtensionType> Extensions { get; set; }
-    public RuntimeDataStorage Wrappers { get; set; }
-    public Dictionary<PyObject, InterDomainContext> Contexts { get; set; }
+    public Dictionary<PyObject, CLRObject> InternalStores { get; init; }
+    public Dictionary<PyObject, ExtensionType> Extensions { get; init; }
+    public RuntimeDataStorage Wrappers { get; init; }
+    public Dictionary<PyObject, InterDomainContext> Contexts { get; init; }
 }
diff --git a/src/runtime/StateSerialization/TypeManagerState.cs b/src/runtime/StateSerialization/TypeManagerState.cs
@@ -3,6 +3,10 @@
 
 namespace Python.Runtime.StateSerialization;
 
+// Workaround for the lack of required properties: https://github.com/dotnet/csharplang/issues/3630
+// Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+#pragma warning disable CS8618
+
 [Serializable]
 internal class TypeManagerState
 {

diff --git a/src/runtime/Util.cs b/src/runtime/Util.cs
@@ -119,13 +119,6 @@ internal static void WriteCLong(BorrowedReference type, int offset, Int64 value)
             }
         }
 
-        /// <summary>
-        /// Null-coalesce: if <paramref name="primary"/> parameter is not
-        /// <see cref="IntPtr.Zero"/>, return it. Otherwise return <paramref name="fallback"/>.
-        /// </summary>
-        internal static IntPtr Coalesce(this IntPtr primary, IntPtr fallback)
-            => primary == IntPtr.Zero ? fallback : primary;
-
         /// <summary>
         /// Gets substring after last occurrence of <paramref name="symbol"/>
         /// </summary>
@@ -149,5 +142,14 @@ internal static string ReadStringResource(this System.Reflection.Assembly assemb
         }
 
         public static IEnumerator<T> GetEnumerator<T>(this IEnumerator<T> enumerator) => enumerator;
+
+        public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T?> source)
+            where T: class
+        {
+            foreach (var item in source)
+            {
+                if (item is not null) yield return item;
+            }
+        }
     }
 }
diff --git a/src/runtime/assemblymanager.cs b/src/runtime/assemblymanager.cs
@@ -358,7 +358,7 @@ public static List<string> GetNames(string nsname)
             //Dictionary<string, int> seen = new Dictionary<string, int>();
             var names = new List<string>(8);
 
-            List<string> g = GenericUtil.GetGenericBaseNames(nsname);
+            List<string>? g = GenericUtil.GetGenericBaseNames(nsname);
             if (g != null)
             {
                 foreach (string n in g)

diff --git a/src/runtime/classbase.cs b/src/runtime/classbase.cs
@@ -67,7 +67,7 @@ public virtual NewReference type_subscript(BorrowedReference idx)
                 return Exceptions.RaiseTypeError(type.DeletedMessage);
             }
 
-            Type target = GenericUtil.GenericForType(type.Value, types.Length);
+            Type? target = GenericUtil.GenericForType(type.Value, types.Length);
 
             if (target != null)
             {
@@ -396,7 +396,7 @@ protected override void OnSave(BorrowedReference ob, InterDomainContext context)
             context.Storage.AddValue("impl", this);
         }
 
-        protected override void OnLoad(BorrowedReference ob, InterDomainContext context)
+        protected override void OnLoad(BorrowedReference ob, InterDomainContext? context)
         {
             base.OnLoad(ob, context);
             var gcHandle = GCHandle.Alloc(this);

diff --git a/src/runtime/classderived.cs b/src/runtime/classderived.cs
@@ -144,7 +144,7 @@ internal static NewReference ToPython(IPythonDerivedType obj)
         internal static Type CreateDerivedType(string name,
             Type baseType,
             BorrowedReference py_dict,
-            string namespaceStr,
+            string? namespaceStr,
             string? assemblyName,
             string moduleName = "Python.Runtime.Dynamic.dll")
         {
@@ -669,7 +669,7 @@ public class PythonDerivedType
         /// method binding (i.e. it has been overridden in the derived python
         /// class) it calls it, otherwise it calls the base method.
         /// </summary>
-        public static T InvokeMethod<T>(IPythonDerivedType obj, string methodName, string origMethodName, object[] args)
+        public static T? InvokeMethod<T>(IPythonDerivedType obj, string methodName, string origMethodName, object[] args)
         {
             var self = GetPyObj(obj);
 
@@ -776,7 +776,7 @@ public static void InvokeMethodVoid(IPythonDerivedType obj, string methodName, s
                 args);
         }
 
-        public static T InvokeGetProperty<T>(IPythonDerivedType obj, string propertyName)
+        public static T? InvokeGetProperty<T>(IPythonDerivedType obj, string propertyName)
         {
             var self = GetPyObj(obj);
 

diff --git a/src/runtime/clrobject.cs b/src/runtime/clrobject.cs
@@ -59,7 +59,7 @@ internal static void Restore(object ob, BorrowedReference pyHandle, InterDomainC
             co.OnLoad(pyHandle, context);
         }
 
-        protected override void OnLoad(BorrowedReference ob, InterDomainContext context)
+        protected override void OnLoad(BorrowedReference ob, InterDomainContext? context)
         {
             base.OnLoad(ob, context);
             GCHandle gc = GCHandle.Alloc(this);

diff --git a/src/runtime/converterextensions.cs b/src/runtime/converterextensions.cs
@@ -126,7 +126,7 @@ internal static bool TryDecode(BorrowedReference pyHandle, BorrowedReference pyT
             Debug.Assert(PyType.IsType(sourceTypeRef));
             var pyType = new PyType(sourceTypeRef, prevalidated: true);
 
-            IPyObjectDecoder decoder;
+            IPyObjectDecoder? decoder;
             lock (decoders)
             {
                 decoder = decoders.GetDecoder(pyType, targetType);

diff --git a/src/runtime/extensiontype.cs b/src/runtime/extensiontype.cs
@@ -95,7 +95,7 @@ public static int tp_clear(BorrowedReference ob)
             return res;
         }
 
-        protected override void OnLoad(BorrowedReference ob, InterDomainContext context)
+        protected override void OnLoad(BorrowedReference ob, InterDomainContext? context)
         {
             base.OnLoad(ob, context);
             SetupGc(ob, Runtime.PyObject_TYPE(ob));

diff --git a/src/runtime/fieldobject.cs b/src/runtime/fieldobject.cs
@@ -14,7 +14,7 @@ internal class FieldObject : ExtensionType
 
         public FieldObject(FieldInfo info)
         {
-            this.info = info;
+            this.info = new MaybeFieldInfo(info);
         }
 
         /// <summary>
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ public IEnumerator<T> GetEnumerator() @@
                         iterObject.Dispose();
                         break;
                     }
-                    yield return iterObject.Current.As<T>();
+                    yield return iterObject.Current.As<T>()!;
                 }
             }
         }
@@ Expand Down @@