remove obsolete buffer proc storing

Author: timfel

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

@@ -51,9 +51,14 @@ int mmap_getbuffer(PyObject *self, Py_buffer *view, int flags) {
 
 static PyObject* mmap_init_bufferprotocol(PyObject* self, PyObject* mmap_type) {
 	assert(PyType_Check(mmap_type));
-        initialize_type_structure(&mmap_object_type, (PyTypeObject*)mmap_type, polyglot_mmap_object_typeid());
 
-	polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_SetBufferProcs", native_to_java(mmap_type), (getbufferproc) mmap_getbuffer, (releasebufferproc) NULL);
+	initialize_type_structure(&mmap_object_type, (PyTypeObject*)mmap_type, polyglot_mmap_object_typeid());
+	static PyBufferProcs mmap_as_buffer = {
+	    (getbufferproc)mmap_getbuffer,
+	    (releasebufferproc)NULL,
+	};
+	mmap_object_type.tp_as_buffer = &mmap_as_buffer;
+
 	return Py_None;
 }
 

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

@@ -322,11 +322,6 @@ static void initialize_globals() {
 }
 
 static void initialize_bufferprocs() {
-    polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_SetBufferProcs", native_to_java((PyObject*)&PyBytes_Type), (getbufferproc)bytes_buffer_getbuffer, (releasebufferproc)NULL);
-    polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_SetBufferProcs", native_to_java((PyObject*)&PyByteArray_Type), (getbufferproc)bytearray_getbuffer, (releasebufferproc)bytearray_releasebuffer);
-    polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_SetBufferProcs", native_to_java((PyObject*)&PyBuffer_Type), (getbufferproc)bufferdecorator_getbuffer, (releasebufferproc)NULL);
-    polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_SetBufferProcs", native_to_java((PyObject*)&PyMemoryView_Type), (getbufferproc)memoryview_getbuffer, (releasebufferproc)memoryview_releasebuffer);
-
     static PyBufferProcs bytes_as_buffer = {
         (getbufferproc)bytes_buffer_getbuffer,       /* bf_getbuffer */
         (releasebufferproc)NULL,                     /* bf_releasebuffer */

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

@@ -1149,23 +1149,6 @@ static Object doPythonObject(PythonClassNativeWrapper klass, Object ptr,
         }
     }
 
-    @Builtin(name = "PyTruffle_SetBufferProcs", minNumOfPositionalArgs = 3)
-    @GenerateNodeFactory
-    abstract static class PyTruffleSetBufferProcs extends PythonTernaryBuiltinNode {
-
-        @Specialization
-        static Object doNativeWrapper(PythonClassNativeWrapper nativeWrapper, Object getBufferProc, Object releaseBufferProc) {
-            nativeWrapper.setGetBufferProc(getBufferProc);
-            nativeWrapper.setReleaseBufferProc(releaseBufferProc);
-            return PNone.NO_VALUE;
-        }
-
-        @Specialization
-        static Object doPythonObject(PythonManagedClass obj, Object getBufferProc, Object releaseBufferProc) {
-            return doNativeWrapper(obj.getClassNativeWrapper(), getBufferProc, releaseBufferProc);
-        }
-    }
-
     @Builtin(name = "PyMemoryView_FromObject", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     abstract static class PyTruffleMemoryViewFromObject extends NativeBuiltin {

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

@@ -51,8 +51,6 @@
  */
 public class PythonClassNativeWrapper extends DynamicObjectNativeWrapper.PythonObjectNativeWrapper {
     private final CStringWrapper nameWrapper;
-    private Object getBufferProc;
-    private Object releaseBufferProc;
 
     private PythonClassNativeWrapper(PythonManagedClass object, String name) {
         super(object);
@@ -63,22 +61,6 @@ public CStringWrapper getNameWrapper() {
         return nameWrapper;
     }
 
-    public Object getGetBufferProc() {
-        return getBufferProc;
-    }
-
-    public void setGetBufferProc(Object getBufferProc) {
-        this.getBufferProc = getBufferProc;
-    }
-
-    public Object getReleaseBufferProc() {
-        return releaseBufferProc;
-    }
-
-    public void setReleaseBufferProc(Object releaseBufferProc) {
-        this.releaseBufferProc = releaseBufferProc;
-    }
-
     public static PythonClassNativeWrapper wrap(PythonManagedClass obj, String name) {
         // important: native wrappers are cached
         PythonClassNativeWrapper nativeWrapper = obj.getClassNativeWrapper();