Fix or disable warnings in Python.Runtime (#1318)

filmor · web-flow · commit bd264cf003ca · 2020-12-12T21:24:21.000+01:00
The only tricky one here is the `LookupType` obsoletion, since we are
still not handling name conflicts.
diff --git a/src/runtime/BorrowedReference.cs b/src/runtime/BorrowedReference.cs
@@ -27,5 +27,14 @@ public BorrowedReference(IntPtr pointer)
             => a.pointer == b.pointer;
         public static bool operator !=(BorrowedReference a, BorrowedReference b)
             => a.pointer != b.pointer;
+
+        public override bool Equals(object obj) {
+            if (obj is IntPtr ptr)
+                return ptr == pointer;
+
+            return false;
+        }
+
+        public override int GetHashCode() => pointer.GetHashCode();
     }
 }
diff --git a/src/runtime/assemblymanager.cs b/src/runtime/assemblymanager.cs
@@ -20,9 +20,9 @@ internal class AssemblyManager
         // therefore this should be a ConcurrentDictionary
         //
         // WARNING: Dangerous if cross-app domain usage is ever supported
-        //    Reusing the dictionary with assemblies accross multiple initializations is problematic. 
-        //    Loading happens from CurrentDomain (see line 53). And if the first call is from AppDomain that is later unloaded, 
-        //    than it can end up referring to assemblies that are already unloaded (default behavior after unload appDomain - 
+        //    Reusing the dictionary with assemblies accross multiple initializations is problematic.
+        //    Loading happens from CurrentDomain (see line 53). And if the first call is from AppDomain that is later unloaded,
+        //    than it can end up referring to assemblies that are already unloaded (default behavior after unload appDomain -
         //     unless LoaderOptimization.MultiDomain is used);
         //    So for multidomain support it is better to have the dict. recreated for each app-domain initialization
         private static ConcurrentDictionary<string, ConcurrentDictionary<Assembly, string>> namespaces =
@@ -365,25 +365,6 @@ public static List<string> GetNames(string nsname)
             return names;
         }
 
-        /// <summary>
-        /// Returns the System.Type object for a given qualified name,
-        /// looking in the currently loaded assemblies for the named
-        /// type. Returns null if the named type cannot be found.
-        /// </summary>
-        [Obsolete("Use LookupTypes and handle name conflicts")]
-        public static Type LookupType(string qname)
-        {
-            foreach (Assembly assembly in assemblies)
-            {
-                Type type = assembly.GetType(qname);
-                if (type != null && IsExported(type))
-                {
-                    return type;
-                }
-            }
-            return null;
-        }
-
         /// <summary>
         /// Returns the <see cref="Type"/> objects for the given qualified name,
         /// looking in the currently loaded assemblies for the named
diff --git a/src/runtime/classobject.cs b/src/runtime/classobject.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System;
 using System.Reflection;
 
@@ -143,7 +144,7 @@ public override IntPtr type_subscript(IntPtr idx)
                 return Exceptions.RaiseTypeError("type(s) expected");
             }
 
-            Type gtype = AssemblyManager.LookupType($"{type.FullName}`{types.Length}");
+            Type gtype = AssemblyManager.LookupTypes($"{type.FullName}`{types.Length}").FirstOrDefault();
             if (gtype != null)
             {
                 var g = ClassManager.GetClass(gtype) as GenericType;
diff --git a/src/runtime/finalizer.cs b/src/runtime/finalizer.cs
@@ -62,7 +62,9 @@ public IncorrectRefCountException(IntPtr ptr)
         }
 
         public delegate bool IncorrectRefCntHandler(object sender, IncorrectFinalizeArgs e);
-        public event IncorrectRefCntHandler IncorrectRefCntResolver;
+        #pragma warning disable 414
+        public event IncorrectRefCntHandler IncorrectRefCntResolver = null;
+        #pragma warning restore 414
         public bool ThrowIfUnhandleIncorrectRefCount { get; set; } = true;
 
         #endregion
diff --git a/src/runtime/genericutil.cs b/src/runtime/genericutil.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System;
 using System.Collections.Generic;
 using System.Resources;
@@ -124,7 +125,7 @@ public static List<Type> GenericsByName(string ns, string basename)
             foreach (string name in names)
             {
                 string qname = ns + "." + name;
-                Type o = AssemblyManager.LookupType(qname);
+                Type o = AssemblyManager.LookupTypes(qname).FirstOrDefault();
                 if (o != null)
                 {
                     result.Add(o);
diff --git a/src/runtime/interop.cs b/src/runtime/interop.cs
@@ -80,8 +80,8 @@ internal static class ManagedDataOffsets
 
         static class DataOffsets
         {
-            public static readonly int ob_data;
-            public static readonly int ob_dict;
+            public static readonly int ob_data = 0;
+            public static readonly int ob_dict = 0;
 
             static DataOffsets()
             {
diff --git a/src/testing/eventtest.cs b/src/testing/eventtest.cs
@@ -8,6 +8,7 @@ namespace Python.Test
     public delegate void EventHandlerTest(object sender, EventArgsTest e);
 
 
+    #pragma warning disable 67 // Unused events, these are only accessed from Python
     public class EventTest
     {
         public static event EventHandlerTest PublicStaticEvent;
@@ -100,6 +101,7 @@ public static void ShutUpCompiler()
             e.PrivateEvent += f;
         }
     }
+    #pragma warning restore 67
 
 
     public class EventArgsTest : EventArgs

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System.Linq;`
`1`	`2`	`using System;`
`2`	`3`	`using System.Reflection;`
`3`	`4`
`@@ -143,7 +144,7 @@ public override IntPtr type_subscript(IntPtr idx)`
`143`	`144`	`return Exceptions.RaiseTypeError("type(s) expected");`
`144`	`145`	`}`
`145`	`146`
`146`		- Type gtype = AssemblyManager.LookupType($"{type.FullName}`{types.Length}");
	`147`	+ Type gtype = AssemblyManager.LookupTypes($"{type.FullName}`{types.Length}").FirstOrDefault();
`147`	`148`	`if (gtype != null)`
`148`	`149`	`{`
`149`	`150`	`var g = ClassManager.GetClass(gtype) as GenericType;`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,9 @@ public IncorrectRefCountException(IntPtr ptr)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public delegate bool IncorrectRefCntHandler(object sender, IncorrectFinalizeArgs e);`
`65`		`- public event IncorrectRefCntHandler IncorrectRefCntResolver;`
	`65`	`+ #pragma warning disable 414`
	`66`	`+ public event IncorrectRefCntHandler IncorrectRefCntResolver = null;`
	`67`	`+ #pragma warning restore 414`
`66`	`68`	`public bool ThrowIfUnhandleIncorrectRefCount { get; set; } = true;`
`67`	`69`
`68`	`70`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,8 @@ internal static class ManagedDataOffsets`
`80`	`80`
`81`	`81`	`static class DataOffsets`
`82`	`82`	`{`
`83`		`- public static readonly int ob_data;`
`84`		`- public static readonly int ob_dict;`
	`83`	`+ public static readonly int ob_data = 0;`
	`84`	`+ public static readonly int ob_dict = 0;`
`85`	`85`
`86`	`86`	`static DataOffsets()`
`87`	`87`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace Python.Test`
`8`	`8`	`public delegate void EventHandlerTest(object sender, EventArgsTest e);`
`9`	`9`
`10`	`10`
	`11`	`+ #pragma warning disable 67 // Unused events, these are only accessed from Python`
`11`	`12`	`public class EventTest`
`12`	`13`	`{`
`13`	`14`	`public static event EventHandlerTest PublicStaticEvent;`
`@@ -100,6 +101,7 @@ public static void ShutUpCompiler()`
`100`	`101`	`e.PrivateEvent += f;`
`101`	`102`	`}`
`102`	`103`	`}`
	`104`	`+ #pragma warning restore 67`
`103`	`105`
`104`	`106`
`105`	`107`	`public class EventArgsTest : EventArgs`