Sync memoryobject.c with CPython

Author: msimacek

graalpython/com.oracle.graal.python.cext/include/memoryobject.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2024, Oracle and/or its affiliates.
  * Copyright (C) 1996-2017 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -21,9 +21,9 @@ PyAPI_DATA(PyTypeObject) PyMemoryView_Type;
 
 #ifndef Py_LIMITED_API
 /* Get a pointer to the memoryview's private copy of the exporter's buffer. */
-#define PyMemoryView_GET_BUFFER(op) (_PyMemoryView_GetBuffer((PyObject *)(op)))
+#define PyMemoryView_GET_BUFFER(op) (&((PyMemoryViewObject *)(op))->view)
 /* Get a pointer to the exporting object (this may be NULL!). */
-#define PyMemoryView_GET_BASE(op) (_PyMemoryView_GetBuffer((PyObject *)(op))->obj)
+#define PyMemoryView_GET_BASE(op) (((PyMemoryViewObject *)(op))->view.obj)
 #endif
 
 PyAPI_FUNC(PyObject *) PyMemoryView_FromObject(PyObject *base);
@@ -70,10 +70,6 @@ typedef struct {
     PyObject *weakreflist;
     Py_ssize_t ob_array[1];       /* shape, strides, suboffsets */
 } PyMemoryViewObject;
-
-
-PyAPI_FUNC(Py_buffer *) _PyMemoryView_GetBuffer(PyObject *op);
-
 #endif
 
 #ifdef __cplusplus

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

@@ -278,8 +278,8 @@ int bytearray_getbuffer(PyByteArrayObject *obj, Py_buffer *view, int flags);
 void bytearray_releasebuffer(PyByteArrayObject *obj, Py_buffer *view);
 
 /* MEMORYVIEW */
-int memoryview_getbuffer(PyMemoryViewObject *self, Py_buffer *view, int flags);
-void memoryview_releasebuffer(PyMemoryViewObject *self, Py_buffer *view);
+int memory_getbuf(PyMemoryViewObject *self, Py_buffer *view, int flags);
+void memory_releasebuf(PyMemoryViewObject *self, Py_buffer *view);
 
 static void initialize_bufferprocs() {
     static PyBufferProcs bytes_as_buffer = {
@@ -297,8 +297,8 @@ static void initialize_bufferprocs() {
     GraalPy_set_PyTypeObject_tp_as_buffer(&PyByteArray_Type, &bytearray_as_buffer);
 
     static PyBufferProcs memory_as_buffer = {
-        (getbufferproc)memoryview_getbuffer,         /* bf_getbuffer */
-        (releasebufferproc)memoryview_releasebuffer, /* bf_releasebuffer */
+        (getbufferproc)memory_getbuf,         /* bf_getbuffer */
+        (releasebufferproc)memory_releasebuf, /* bf_releasebuffer */
     };
     PyMemoryView_Type.tp_as_buffer = &memory_as_buffer;
     GraalPy_set_PyTypeObject_tp_as_buffer(&PyMemoryView_Type, &memory_as_buffer);