Merge PythonBufferLibrary into PythonObjectLibrary

Author: timfel

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

@@ -84,7 +84,6 @@
 import com.oracle.graal.python.builtins.objects.bytes.PByteArray;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
-import com.oracle.graal.python.builtins.objects.bytes.PythonBufferLibrary;
 import com.oracle.graal.python.builtins.objects.cell.PCell;
 import com.oracle.graal.python.builtins.objects.cext.CExtNodes;
 import com.oracle.graal.python.builtins.objects.cext.CExtNodes.PCallCapiFunction;
@@ -2710,8 +2709,8 @@ Object call(VirtualFrame frame, LazyPythonClass cls, int argcount, int kwonlyarg
                         PTuple varnames, Object filename, Object name,
                         int firstlineno, Object lnotab,
                         PTuple freevars, PTuple cellvars,
-                        @CachedLibrary("codestring") PythonBufferLibrary codestringBufferLib,
-                        @CachedLibrary("lnotab") PythonBufferLibrary lnotabBufferLib,
+                        @CachedLibrary("codestring") PythonObjectLibrary codestringBufferLib,
+                        @CachedLibrary("lnotab") PythonObjectLibrary lnotabBufferLib,
                         @Cached CodeNodes.CreateCodeNode createCodeNode,
                         @Cached GetObjectArrayNode getObjectArrayNode) throws UnsupportedMessageException {
             byte[] codeBytes = codestringBufferLib.getBufferBytes(codestring);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/DefaultBufferStringExports.java

@@ -28,6 +28,7 @@
 import java.util.Arrays;
 
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
+import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
@@ -39,7 +40,7 @@
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 
-@ExportLibrary(PythonBufferLibrary.class)
+@ExportLibrary(PythonObjectLibrary.class)
 public final class PByteArray extends PSequence implements PIBytesLike {
 
     private SequenceStorage store;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PByteArray.java

@@ -28,6 +28,7 @@
 import java.util.Arrays;
 
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
+import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.runtime.sequence.PImmutableSequence;
 import com.oracle.graal.python.runtime.sequence.PSequence;
@@ -40,7 +41,7 @@
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 
-@ExportLibrary(PythonBufferLibrary.class)
+@ExportLibrary(PythonObjectLibrary.class)
 public final class PBytes extends PImmutableSequence implements PIBytesLike {
 
     private SequenceStorage store;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PBytes.java

@@ -40,8 +40,8 @@
  */
 package com.oracle.graal.python.builtins.objects.memoryview;
 
-import com.oracle.graal.python.builtins.objects.bytes.PythonBufferLibrary;
 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.type.LazyPythonClass;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromDynamicObjectNode;
@@ -53,7 +53,7 @@
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 
-@ExportLibrary(PythonBufferLibrary.class)
+@ExportLibrary(PythonObjectLibrary.class)
 public class PMemoryView extends PythonBuiltinObject {
 
     static final String C_MEMORYVIEW = "__c_memoryview";

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PythonBufferLibrary.java

@@ -43,9 +43,9 @@
 import java.io.IOException;
 import java.nio.channels.SeekableByteChannel;
 
-import com.oracle.graal.python.builtins.objects.bytes.PythonBufferLibrary;
 import com.oracle.graal.python.builtins.objects.mmap.MMapBuiltins.InternalLenNode;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
+import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.nodes.util.CastToJavaIntNode;
 import com.oracle.graal.python.nodes.util.ChannelNodes.ReadFromChannelNode;
@@ -56,7 +56,7 @@
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 
-@ExportLibrary(PythonBufferLibrary.class)
+@ExportLibrary(PythonObjectLibrary.class)
 public final class PMMap extends PythonObject {
 
     private final SeekableByteChannel mappedByteBuffer;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/PMemoryView.java

@@ -42,6 +42,7 @@
 
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 
@@ -61,4 +62,20 @@ static boolean isHashable(@SuppressWarnings("unused") String value) {
     static LazyPythonClass getLazyPythonClass(@SuppressWarnings("unused") String value) {
         return PythonBuiltinClassType.PString;
     }
+
+    @ExportMessage
+    static boolean isBuffer(@SuppressWarnings("unused") String str) {
+        return true;
+    }
+
+    @ExportMessage
+    static int getBufferLength(@SuppressWarnings("unused") String str) {
+        return getBufferBytes(str).length;
+    }
+
+    @ExportMessage
+    @TruffleBoundary
+    static byte[] getBufferBytes(String str) {
+        return str.getBytes();
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/mmap/PMMap.java

@@ -285,6 +285,21 @@ public boolean isMappingType(Object receiver) {
         return false;
     }
 
+    @Abstract(ifExported = {"getBufferBytes", "getBufferLength"})
+    public boolean isBuffer(Object receiver) {
+        return false;
+    }
+
+    @Abstract(ifExported = {"isBuffer", "getBufferBytes"})
+    public int getBufferLength(Object receiver) throws UnsupportedMessageException {
+        throw UnsupportedMessageException.create();
+    }
+
+    @Abstract(ifExported = {"isBuffer", "getBufferLength"})
+    public byte[] getBufferBytes(Object receiver) throws UnsupportedMessageException {
+        throw UnsupportedMessageException.create();
+    }
+
     public static boolean checkIsIterable(PythonObjectLibrary library, ContextReference<PythonContext> contextRef, VirtualFrame frame, Object object, Node callNode) {
         PythonContext context = contextRef.get();
         PException caughtException = IndirectCallContext.enter(frame, context, callNode);