Implement C API function PyModuleDef_Init

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -171,6 +171,7 @@ declare_type(PyTuple_Type, tuple, PyTupleObject);
 declare_type(PyList_Type, list, PyListObject);
 declare_type(PyComplex_Type, complex, PyComplexObject);
 declare_type(PyModule_Type, module, PyModuleObject);
+declare_type(PyModuleDef_Type, moduledef, PyModuleDef);
 declare_type(PyCapsule_Type, PyCapsule, PyCapsule);
 declare_type(PyMemoryView_Type, memoryview, PyMemoryViewObject);
 declare_type(PySet_Type, set, PySetObject);

graalpython/com.oracle.graal.python.cext/src/moduleobject.c

@@ -42,7 +42,29 @@
 
 PyTypeObject PyModule_Type = PY_TRUFFLE_TYPE("module", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE, sizeof(PyModuleObject));
 
-/* Modules */
+PyTypeObject PyModuleDef_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "moduledef",                                /* tp_name */
+    sizeof(struct PyModuleDef),                 /* tp_basicsize */
+    0,                                          /* tp_itemsize */
+};
+
+
+UPCALL_ID(_PyModule_GetAndIncMaxModuleNumber);
+// partially taken from CPython "Objects/moduleobject.c"
+PyObject*
+PyModuleDef_Init(struct PyModuleDef* def)
+{
+    if (PyType_Ready(&PyModuleDef_Type) < 0)
+         return NULL;
+    if (def->m_base.m_index == 0) {
+        Py_REFCNT(def) = 1;
+        Py_TYPE(def) = &PyModuleDef_Type;
+        def->m_base.m_index = UPCALL_CEXT_L(_jls__PyModule_GetAndIncMaxModuleNumber);
+    }
+    return (PyObject*)def;
+}
+
 int PyModule_AddFunctions(PyObject* mod, PyMethodDef* methods) {
     if (!methods) {
         return -1;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -108,6 +108,7 @@ public enum PythonBuiltinClassType implements TruffleObject {
     PTuple("tuple", BuiltinNames.BUILTINS),
     PythonClass("type", BuiltinNames.BUILTINS),
     PythonModule("module"),
+    PythonModuleDef("moduledef", false),
     PythonObject("object", BuiltinNames.BUILTINS),
     Super("super", BuiltinNames.BUILTINS),
     PCode("code", false),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

@@ -3655,4 +3655,17 @@ static Object doGeneric(Object object) {
             return new PyDateTimeCAPIWrapper(object);
         }
     }
+
+    @Builtin(name = "_PyModule_GetAndIncMaxModuleNumber")
+    @GenerateNodeFactory
+    abstract static class PyModuleGetAndIncMaxModuleNumber extends PythonBuiltinNode {
+
+        @Specialization
+        static long doIt(
+                        @CachedContext(PythonLanguage.class) PythonContext context) {
+            CApiContext nativeContext = context.getCApiContext();
+            return nativeContext.getAndIncMaxModuleNumber();
+
+        }
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java

@@ -132,6 +132,9 @@ public final class CApiContext extends CExtContext {
     /** Cache for polyglot types of primitive and pointer types. */
     @CompilationFinal(dimensions = 1) private final TruffleObject[] llvmTypeCache;
 
+    /** same as {@code moduleobject.c: max_module_number} */
+    private long maxModuleNumber;
+
     public CApiContext(PythonContext context, Object hpyLibrary) {
         super(context, hpyLibrary, CAPIConversionNodeSupplier.INSTANCE);
         nativeObjectsQueue = new ReferenceQueue<>();
@@ -193,6 +196,10 @@ public void setLLVMTypeID(LLVMType llvmType, TruffleObject llvmTypeId) {
         llvmTypeCache[llvmType.ordinal()] = llvmTypeId;
     }
 
+    public long getAndIncMaxModuleNumber() {
+        return maxModuleNumber++;
+    }
+
     @TruffleBoundary
     public static Object asHex(Object ptr) {
         if (ptr instanceof Number) {
@@ -802,5 +809,4 @@ public static boolean isPointerToPrimitive(LLVMType llvmType) {
             return false;
         }
     }
-
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java

@@ -214,6 +214,9 @@ static long doBuiltinClassType(PythonBuiltinClassType clazz) {
                 case PTuple:
                     result = DEFAULT | HAVE_GC | BASETYPE | TUPLE_SUBCLASS;
                     break;
+                case PythonModuleDef:
+                    result = 0;
+                    break;
                 default:
                     // default case; this includes:
                     // PythonObject, PByteArray, PCode, PInstancemethod, PFloat, PNone,