implemented NativeTypeOffset for installation with setup.py

lostmsu · lostmsu · commit d6541a3f9e6c · 2020-11-24T18:25:18.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,8 @@
+/src/runtime/interopNative.cs
+
+# VS Code
+.vscode/
+
 # General binaries and Build results
 *.dll
 *.exe
diff --git a/src/runtime/interop36.cs b/src/runtime/interop36.cs
@@ -2,6 +2,8 @@
 // Auto-generated by geninterop.py.
 // DO NOT MODIFY BY HAND.
 
+// Python 3.6: ABI flags: ''
+
 // ReSharper disable InconsistentNaming
 // ReSharper disable IdentifierTypo
 
diff --git a/src/runtime/interop37.cs b/src/runtime/interop37.cs
@@ -2,6 +2,8 @@
 // Auto-generated by geninterop.py.
 // DO NOT MODIFY BY HAND.
 
+// Python 3.7: ABI flags: ''
+
 // ReSharper disable InconsistentNaming
 // ReSharper disable IdentifierTypo
 
diff --git a/src/runtime/interop38.cs b/src/runtime/interop38.cs
@@ -2,6 +2,8 @@
 // Auto-generated by geninterop.py.
 // DO NOT MODIFY BY HAND.
 
+// Python 3.8: ABI flags: ''
+
 // ReSharper disable InconsistentNaming
 // ReSharper disable IdentifierTypo
 
diff --git a/src/runtime/interop39.cs b/src/runtime/interop39.cs
@@ -2,6 +2,8 @@
 // Auto-generated by geninterop.py.
 // DO NOT MODIFY BY HAND.
 
+// Python 3.9: ABI flags: ''
+
 // ReSharper disable InconsistentNaming
 // ReSharper disable IdentifierTypo
 
diff --git a/src/runtime/native/ABI.cs b/src/runtime/native/ABI.cs
@@ -15,8 +15,12 @@ internal static void Initialize(Version version, BorrowedReference pyType)
 
             var thisAssembly = Assembly.GetExecutingAssembly();
 
+            const string nativeTypeOffsetClassName = "Python.Runtime.NativeTypeOffset";
             string className = "Python.Runtime.TypeOffset" + offsetsClassSuffix;
-            Type typeOffsetsClass = thisAssembly.GetType(className, throwOnError: false);
+            Type typeOffsetsClass =
+                // Try platform native offsets first. It is only present when generated by setup.py
+                thisAssembly.GetType(nativeTypeOffsetClassName, throwOnError: false)
+                ?? thisAssembly.GetType(className, throwOnError: false);
             if (typeOffsetsClass is null)
                 throw new NotSupportedException($"Python ABI v{version} is not supported");
             var typeOffsets = (ITypeOffsets)Activator.CreateInstance(typeOffsetsClass);
diff --git a/tools/geninterop/geninterop.py b/tools/geninterop/geninterop.py
@@ -244,22 +244,15 @@ def preprocess_python_headers():
 
 
 def gen_interop_head(writer):
-    if hasattr(sys, "abiflags"):
-        if "d" in sys.abiflags:
-            defines.append("PYTHON_WITH_PYDEBUG")
-            raise NotImplementedError
-        if "m" in sys.abiflags:
-            defines.append("PYTHON_WITH_PYMALLOC")
-            raise NotImplementedError
-        if "u" in sys.abiflags:
-            defines.append("PYTHON_WITH_WIDE_UNICODE")
-            raise NotImplementedError
-
     filename = os.path.basename(__file__)
+    abi_flags = sys.abiflags if hasattr(sys, "abiflags") else ''
+    py_ver = "{0}.{1}".format(PY_MAJOR, PY_MINOR)
     class_definition = """
 // Auto-generated by %s.
 // DO NOT MODIFY BY HAND.
 
+// Python %s: ABI flags: '%s'
+
 // ReSharper disable InconsistentNaming
 // ReSharper disable IdentifierTypo
 
@@ -270,7 +263,7 @@ def gen_interop_head(writer):
 using Python.Runtime.Native;
 
 namespace Python.Runtime
-{""" % filename
+{""" % (filename, py_ver, abi_flags)
     writer.extend(class_definition)
 
 
@@ -281,20 +274,21 @@ def gen_interop_tail(writer):
     writer.extend(tail)
 
 
-def gen_heap_type_members(parser, writer):
+def gen_heap_type_members(parser, writer, type_name = None):
     """Generate the TypeOffset C# class"""
     members = parser.get_struct_members("PyHeapTypeObject")
+    type_name = type_name or "TypeOffset{0}{1}".format(PY_MAJOR, PY_MINOR)
     class_definition = """
     [SuppressMessage("Style", "IDE1006:Naming Styles",
                      Justification = "Following CPython",
                      Scope = "type")]
 
     [StructLayout(LayoutKind.Sequential)]
-    internal class TypeOffset{0}{1} : GeneratedTypeOffsets, ITypeOffsets
+    internal class {0} : GeneratedTypeOffsets, ITypeOffsets
     {{
-        public TypeOffset{0}{1}() {{ }}
+        public {0}() {{ }}
         // Auto-generated from PyHeapTypeObject in Python.h
-""".format(PY_MAJOR, PY_MINOR)
+""".format(type_name)
 
     # All the members are sizeof(void*) so we don't need to do any
     # extra work to determine the size based on the type.
@@ -347,9 +341,10 @@ def main():
 
     writer = Writer()
     # generate the C# code
+    offsets_type_name = "NativeTypeOffset" if len(sys.argv) > 1 else None
     gen_interop_head(writer)
 
-    gen_heap_type_members(ast_parser, writer)
+    gen_heap_type_members(ast_parser, writer, type_name = offsets_type_name)
 
     ver_define = "PYTHON{0}{1}".format(PY_MAJOR, PY_MINOR)
     writer.append(code="#if " + ver_define)
