[GR-27559] Remove PythonObjectLibrary

PullRequest: graalpython/1997

Author: msimacek

graalpython/com.oracle.graal.python.annotations/src/com/oracle/graal/python/annotations/ArgumentClinic.java

@@ -155,10 +155,6 @@ enum ClinicConversion {
          * Corresponds to CPython's {@code object(subclass_of="&PyTuple_Type"))} converter.
          */
         Tuple,
-        /**
-         * Deprecated. Legacy converter for PythonObjectLibrary buffers.
-         */
-        Buffer,
         /**
          * Corresponds to CPython's {@code Py_buffer} converter for a readonly contiguous buffer.
          * Returns an opaque buffer object that is accessed using {@code PythonBufferAccessLibrary}.

graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/ConverterFactory.java

@@ -94,7 +94,6 @@ public enum Param {
     private static ConverterFactory[] BuiltinLong;
     private static ConverterFactory[] BuiltinCodePoint;
     private static ConverterFactory[] BuiltinTuple;
-    private static ConverterFactory[] BuiltinBuffer;
     private static ConverterFactory[] BuiltinReadableBuffer;
     private static ConverterFactory[] BuiltinWritableBuffer;
     private static ConverterFactory[] BuiltinIndex;
@@ -145,8 +144,6 @@ public static ConverterFactory[] getBuiltin(ArgumentClinic annotation) {
                 return BuiltinCodePoint;
             case Tuple:
                 return BuiltinTuple;
-            case Buffer:
-                return BuiltinBuffer;
             case ReadableBuffer:
                 return BuiltinReadableBuffer;
             case WritableBuffer:
@@ -228,7 +225,6 @@ public static void initBuiltins(Elements elementUtils) throws ProcessingError {
         BuiltinDouble = forBuiltin(elementUtils, "JavaDoubleConversionNode");
         BuiltinCodePoint = forBuiltin(elementUtils, "CodePointConversionNode");
         BuiltinTuple = forBuiltin(elementUtils, "TupleConversionNode");
-        BuiltinBuffer = forBuiltin(elementUtils, "BufferConversionNode");
         BuiltinReadableBuffer = forBuiltin(elementUtils, "ReadableBufferConversionNode");
         BuiltinWritableBuffer = forBuiltin(elementUtils, "WritableBufferConversionNode");
         BuiltinIndex = forBuiltin(elementUtils, "IndexConversionNode");

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/objects/PythonObjectLibraryTests.java

@@ -51,31 +51,20 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.modules.GraalHPyDebugModuleBuiltins;
-import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor;
-import com.oracle.graal.python.builtins.objects.function.PArguments;
-import com.oracle.graal.python.builtins.objects.function.PArguments.ThreadState;
-import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
-import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Cached.Exclusive;
-import com.oracle.truffle.api.dsl.Cached.Shared;
-import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.library.Message;
 import com.oracle.truffle.api.library.ReflectionLibrary;
 import com.oracle.truffle.api.object.Shape;
-import com.oracle.truffle.api.profiles.ConditionProfile;
 
-@ExportLibrary(PythonObjectLibrary.class)
 // InteropLibrary is proxied through ReflectionLibrary
 @ExportLibrary(ReflectionLibrary.class)
 public enum PythonBuiltinClassType implements TruffleObject {
@@ -723,59 +712,7 @@ public Object send(Message message, Object[] args,
         return lib.send(PythonContext.get(lib).getCore().lookupType(this), message, args);
     }
 
-    @ExportMessage
-    public Object lookupAttributeInternal(ThreadState state, String attribName, boolean strict,
-                    @Cached ConditionProfile gotState,
-                    @Cached.Exclusive @Cached PythonAbstractObject.LookupAttributeNode lookup) {
-        VirtualFrame frame = null;
-        if (gotState.profile(state != null)) {
-            frame = PArguments.frameForCall(state);
-        }
-        return lookup.execute(frame, this, attribName, strict);
-    }
-
-    @ExportMessage
-    @SuppressWarnings("static-method")
-    public Object lookupAttributeOnTypeInternal(String attributeName, boolean strict,
-                    @Exclusive @Cached PythonAbstractObject.LookupAttributeOnTypeNode lookup,
-                    @Cached.Exclusive @Cached GilNode gil) {
-        boolean mustRelease = gil.acquire();
-        try {
-            return lookup.execute(PythonClass, attributeName, strict);
-        } finally {
-            gil.release(mustRelease);
-        }
-    }
-
-    @ExportMessage
-    @SuppressWarnings("static-method")
-    public boolean isCallable() {
-        return true;
-    }
-
-    @ExportMessage
-    public Object callObjectWithState(ThreadState state, Object[] arguments,
-                    @CachedLibrary(limit = "1") PythonObjectLibrary lib) {
-        return lib.callObjectWithState(PythonContext.get(lib).getCore().lookupType(this), state, arguments);
-    }
-
     public static boolean isExceptionType(PythonBuiltinClassType type) {
         return type.isException;
     }
-
-    @ExportMessage
-    public Object lookupAndCallSpecialMethodWithState(ThreadState state, String methodName, Object[] arguments,
-                    @CachedLibrary("this") PythonObjectLibrary plib,
-                    @Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {
-        Object method = plib.lookupAttributeOnTypeStrict(this, methodName);
-        return methodLib.callUnboundMethodWithState(method, state, this, arguments);
-    }
-
-    @ExportMessage
-    public Object lookupAndCallRegularMethodWithState(ThreadState state, String methodName, Object[] arguments,
-                    @CachedLibrary("this") PythonObjectLibrary plib,
-                    @Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {
-        Object method = plib.lookupAttributeStrictWithState(this, state, methodName);
-        return methodLib.callObjectWithState(method, state, arguments);
-    }
 }

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

@@ -41,11 +41,12 @@
 package com.oracle.graal.python.builtins.modules.ctypes;
 
 import com.oracle.graal.python.builtins.modules.ctypes.CtypesNodes.DeRefHandleNode;
-import com.oracle.graal.python.builtins.modules.ctypes.PtrValue.ByteArrayStorage;
+import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAccessLibrary;
+import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAcquireLibrary;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
-import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.util.PythonUtils;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.TruffleObject;
@@ -57,7 +58,8 @@
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.llvm.spi.NativeTypeLibrary;
 
-@ExportLibrary(PythonObjectLibrary.class)
+@ExportLibrary(PythonBufferAcquireLibrary.class)
+@ExportLibrary(PythonBufferAccessLibrary.class)
 public class CDataObject extends PythonBuiltinObject {
 
     /*
@@ -92,10 +94,21 @@ protected static CDataObjectWrapper createWrapper(StgDictObject dictObject, byte
         return new CDataObjectWrapper(dictObject, storage);
     }
 
+    @ExportMessage
+    @SuppressWarnings("static-method")
+    boolean hasBuffer() {
+        return true;
+    }
+
+    @ExportMessage
+    Object acquire(@SuppressWarnings("unused") int flags) {
+        return this;
+    }
+
     @ExportMessage
     @SuppressWarnings("static-method")
     boolean isBuffer() {
-        return b_ptr.ptr instanceof ByteArrayStorage;
+        return true;
     }
 
     @ExportMessage
@@ -104,14 +117,51 @@ int getBufferLength() {
     }
 
     @ExportMessage
-    byte[] getBufferBytes() {
-        assert isBuffer();
-        byte[] bytes = ((ByteArrayStorage) b_ptr.ptr).value;
-        if (b_ptr.offset > 0) {
-            return PythonUtils.arrayCopyOfRange(bytes, b_ptr.offset, b_size);
+    byte readByte(int byteIndex,
+                    @CachedLibrary(limit = "2") PythonBufferAccessLibrary bufferLib) {
+        if (b_ptr.ptr != null) {
+            return bufferLib.readByte(b_ptr.ptr, b_ptr.offset + byteIndex);
+        }
+        throw CompilerDirectives.shouldNotReachHere("buffer read from empty CDataObject");
+    }
+
+    @ExportMessage
+    @SuppressWarnings("static-method")
+    boolean isReadonly() {
+        return false;
+    }
+
+    @ExportMessage
+    void writeByte(int byteIndex, byte value,
+                    @CachedLibrary(limit = "2") PythonBufferAccessLibrary bufferLib) {
+        if (b_ptr.ptr != null) {
+            bufferLib.writeByte(b_ptr.ptr, b_ptr.offset + byteIndex, value);
         }
-        return bytes;
+        throw CompilerDirectives.shouldNotReachHere("buffer write to empty CDataObject");
     }
+
+    @ExportMessage
+    boolean hasInternalByteArray(
+                    @CachedLibrary(limit = "2") PythonBufferAccessLibrary bufferLib) {
+        if (b_ptr.offset != 0) {
+            return false;
+        }
+        if (b_ptr.ptr != null) {
+            return bufferLib.hasInternalByteArray(b_ptr.ptr);
+        }
+        return true;
+    }
+
+    @ExportMessage
+    byte[] getInternalByteArray(
+                    @CachedLibrary(limit = "2") PythonBufferAccessLibrary bufferLib) {
+        assert hasInternalByteArray(bufferLib);
+        if (b_ptr.ptr != null) {
+            return bufferLib.getInternalByteArray(b_ptr.ptr);
+        }
+        return PythonUtils.EMPTY_BYTE_ARRAY;
+    }
+
     /*-
     static int PyCData_NewGetBuffer(Object myself, Py_buffer *view, int flags)
     {