Use wrappers for 'memory_getbuf' / 'memory_releasebuf'.

Author: fangerer

graalpython/com.oracle.graal.python.cext/modules/_memoryview.c

@@ -57,6 +57,8 @@
      releasebufferprocs must NOT decrement view.obj.
 */
 
+POLYGLOT_DECLARE_TYPE(PyMemoryViewObject);
+
 extern PyTypeObject PyNativeMemoryView_Type;
 
 #define CHECK_MBUF_RELEASED(mbuf) \
@@ -646,7 +648,7 @@ memory_alloc(int ndim)
     mv->weakreflist = NULL;
 
     _PyObject_GC_TRACK(mv);
-    return mv;
+    return polyglot_from_PyMemoryViewObject(mv);
 }
 
 /*
@@ -966,7 +968,7 @@ memory_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    return PyMemoryView_FromObject(obj);
+    return polyglot_from_PyMemoryViewObject((PyMemoryViewObject *)PyMemoryView_FromObject(obj));
 }
 
 
@@ -1418,21 +1420,11 @@ static PyMemoryViewObject* PyTruffle_MemoryView_GetDelegate(PyObject* managed_se
 }
 
 static int
-memory_getbuf(PyMemoryViewObject *original_self, Py_buffer *view, int flags)
+memory_getbuf(PyMemoryViewObject *self, Py_buffer *view, int flags)
 {
-    PyMemoryViewObject *self = NULL;
     Py_buffer *base = NULL;
     int baseflags = 0;
 
-    // this code may be reached over different path; self may therefore be the managed wrapper or the native object
-    if (PyMemoryView_Check(original_self)) {
-        // we need to get the native delegate of the managed memoryview object
-        self = PyTruffle_MemoryView_GetDelegate((PyObject*) original_self);
-    } else {
-        self = original_self;
-    }
-    assert(Py_TYPE(self) == &PyNativeMemoryView_Type);
-
     base = &self->view;
     baseflags = self->flags;
 
@@ -3142,6 +3134,28 @@ PyTypeObject PyNativeMemoryView_Type = {
     memory_new,                               /* tp_new */
 };
 
+
+static PyMemoryViewObject* _get_managed_self(PyMemoryViewObject *original_self) {
+    PyMemoryViewObject *self = NULL;
+
+    // this code may be reached over different path; self may therefore be the managed wrapper or the native object
+    if (PyMemoryView_Check(original_self)) {
+        // we need to get the native delegate of the managed memoryview object
+        self = PyTruffle_MemoryView_GetDelegate((PyObject*) original_self);
+    }
+    assert(self != NULL);
+    assert(Py_TYPE(self) == &PyNativeMemoryView_Type);
+    return self;
+}
+
+static int memory_managed_getbuf(PyMemoryViewObject *self, Py_buffer *view, int flags) {
+    return memory_getbuf(_get_managed_self(self), view, flags);
+}
+
+static void memory_managed_releasebuf(PyMemoryViewObject *self, Py_buffer *view) {
+    memory_releasebuf(_get_managed_self(self), view);
+}
+
 static struct PyModuleDef _memoryviewmodule = {
     PyModuleDef_HEAD_INIT,
     "_memoryview",
@@ -3177,7 +3191,7 @@ PyInit__memoryview(void)
 
 
     // register buffer procs
-    polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_SetBufferProcs", native_to_java((PyObject*)&PyMemoryView_Type), (getbufferproc)memory_getbuf, (releasebufferproc)memory_releasebuf);
+    polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_SetBufferProcs", native_to_java((PyObject*)&PyMemoryView_Type), (getbufferproc)memory_managed_getbuf, (releasebufferproc)memory_managed_releasebuf);
 
     return m;
 }