Don't implement buffer API in EmptySequenceStorage

Author: msimacek

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

@@ -67,6 +67,7 @@ public PBytesLike(Object cls, Shape instanceShape, byte[] bytes) {
 
     public PBytesLike(Object cls, Shape instanceShape, SequenceStorage store) {
         super(cls, instanceShape);
+        assert store instanceof ByteSequenceStorage || store instanceof NativeByteSequenceStorage;
         this.store = store;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java

@@ -2902,7 +2902,7 @@ static Object[] doEmpty(@SuppressWarnings("unused") EmptySequenceStorage s) {
 
         @Specialization
         static Object[] doNative(NativeSequenceStorage s,
-                        @Cached GetNativeItemScalarNode getNativeItemScalarNode) {
+                        @Cached(inline = false) GetNativeItemScalarNode getNativeItemScalarNode) {
             Object[] result = new Object[s.length()];
             for (int i = 0; i < s.length(); i++) {
                 result[i] = getNativeItemScalarNode.execute(s, i);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BasicSequenceStorage.java

@@ -40,6 +40,10 @@ public abstract class BasicSequenceStorage extends SequenceStorage {
 
     public abstract SequenceStorage copy();
 
+    public abstract SequenceStorage getSliceInBound(int start, int stop, int step, int len);
+
+    public abstract SequenceStorage generalizeFor(Object value, SequenceStorage other);
+
     public abstract Object[] getInternalArray();
 
     public abstract Object[] getCopyOfInternalArray();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/EmptySequenceStorage.java

@@ -25,20 +25,13 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
-import java.nio.ByteOrder;
-
-import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAccessLibrary;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.library.ExportLibrary;
-import com.oracle.truffle.api.library.ExportMessage;
 
-@ExportLibrary(PythonBufferAccessLibrary.class)
 public final class EmptySequenceStorage extends SequenceStorage {
 
     public static final EmptySequenceStorage INSTANCE = new EmptySequenceStorage();
 
-    @Override
     public SequenceStorage generalizeFor(Object value, SequenceStorage target) {
         final SequenceStorage generalized;
 
@@ -72,12 +65,6 @@ public Object getIndicativeValue() {
         return null;
     }
 
-    @Override
-    public SequenceStorage getSliceInBound(int start, int stop, int step, int len) {
-        assert start == stop && stop == 0;
-        return this;
-    }
-
     @Override
     public ListStorageType getElementType() {
         return ListStorageType.Empty;
@@ -88,52 +75,4 @@ public String toString() {
         CompilerAsserts.neverPartOfCompilation();
         return "EmptySequenceStorage[]";
     }
-
-    @ExportMessage
-    @SuppressWarnings("static-method")
-    boolean isBuffer() {
-        return true;
-    }
-
-    @ExportMessage
-    @SuppressWarnings("static-method")
-    int getBufferLength() {
-        return 0;
-    }
-
-    @ExportMessage
-    @SuppressWarnings("static-method")
-    byte readByte(@SuppressWarnings("unused") int byteOffset) throws IndexOutOfBoundsException {
-        throw new IndexOutOfBoundsException("EmptySequenceStorage is always empty!");
-    }
-
-    @ExportMessage
-    @SuppressWarnings({"static-method", "unused"})
-    short readShortByteOrder(int byteOffset, ByteOrder byteOrder) throws IndexOutOfBoundsException {
-        throw new IndexOutOfBoundsException("EmptySequenceStorage is always empty!");
-    }
-
-    @ExportMessage
-    @SuppressWarnings({"static-method", "unused"})
-    int readIntByteOrder(int byteOffset, ByteOrder byteOrder) throws IndexOutOfBoundsException {
-        throw new IndexOutOfBoundsException("EmptySequenceStorage is always empty!");
-    }
-
-    @ExportMessage
-    @SuppressWarnings({"static-method", "unused"})
-    long readLongByteOrder(int byteOffset, ByteOrder byteOrder) throws IndexOutOfBoundsException {
-        throw new IndexOutOfBoundsException("EmptySequenceStorage is always empty!");
-    }
-
-    @ExportMessage
-    @SuppressWarnings({"static-method", "unused"})
-    float readFloatByteOrder(int byteOffset, ByteOrder byteOrder) throws IndexOutOfBoundsException {
-        throw new IndexOutOfBoundsException("EmptySequenceStorage is always empty!");
-    }
-
-    @ExportMessage
-    @SuppressWarnings({"static-method", "unused"})
-    double readDoubleByteOrder(int byteOffset, ByteOrder byteOrder) throws IndexOutOfBoundsException {
-        throw new IndexOutOfBoundsException("EmptySequenceStorage is always empty!");
-    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/NativeSequenceStorage.java

@@ -46,7 +46,6 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.NativeStorageReference;
 import com.oracle.graal.python.util.PythonUtils;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.TruffleLogger;
 
 public abstract class NativeSequenceStorage extends SequenceStorage {
@@ -97,16 +96,6 @@ public final void setNewLength(int length) {
         }
     }
 
-    @Override
-    public final SequenceStorage getSliceInBound(int start, int stop, int step, int len) {
-        throw CompilerDirectives.shouldNotReachHere();
-    }
-
-    @Override
-    public final SequenceStorage generalizeFor(Object value, SequenceStorage other) {
-        throw CompilerDirectives.shouldNotReachHere();
-    }
-
     @Override
     public final Object getIndicativeValue() {
         return null;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/SequenceStorage.java

@@ -79,9 +79,5 @@ public final int getCapacity() {
 
     public abstract ListStorageType getElementType();
 
-    public abstract SequenceStorage getSliceInBound(int start, int stop, int step, int len);
-
-    public abstract SequenceStorage generalizeFor(Object value, SequenceStorage other);
-
     public abstract Object getIndicativeValue();
 }