Push SequenceStorage.copy down

Author: msimacek

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

@@ -2871,9 +2871,18 @@ public abstract static class CopyNode extends Node {
 
         public abstract SequenceStorage execute(Node node, SequenceStorage s);
 
-        @Specialization(limit = "MAX_SEQUENCE_STORAGES", guards = {"s.getClass() == cachedClass", "!isNativeStorage(s)"})
-        static SequenceStorage doSpecial(SequenceStorage s,
-                        @Cached("s.getClass()") Class<? extends SequenceStorage> cachedClass) {
+        public static SequenceStorage executeUncached(SequenceStorage s) {
+            return SequenceStorageNodesFactory.CopyNodeGen.getUncached().execute(null, s);
+        }
+
+        @Specialization
+        static SequenceStorage doEmpty(EmptySequenceStorage s) {
+            return s;
+        }
+
+        @Specialization(limit = "MAX_SEQUENCE_STORAGES", guards = "s.getClass() == cachedClass")
+        static SequenceStorage doSpecial(BasicSequenceStorage s,
+                        @Cached("s.getClass()") Class<? extends BasicSequenceStorage> cachedClass) {
             return CompilerDirectives.castExact(CompilerDirectives.castExact(s, cachedClass).copy(), cachedClass);
         }
 
@@ -2896,16 +2905,6 @@ static SequenceStorage doNativeObjects(NativeObjectSequenceStorage s,
             }
             return new ObjectSequenceStorage(objects);
         }
-
-        @Specialization(guards = "!isNativeStorage(s)", replaces = "doSpecial")
-        @TruffleBoundary
-        static SequenceStorage doGeneric(SequenceStorage s) {
-            return s.copy();
-        }
-
-        protected static boolean isNativeStorage(SequenceStorage storage) {
-            return storage instanceof NativeSequenceStorage;
-        }
     }
 
     @GenerateUncached
@@ -3893,12 +3892,11 @@ public SequenceStorage execute(VirtualFrame frame, Object iterator, int len) {
 
             @TruffleBoundary
             private static SequenceStorage executeImpl(Object iterator, int len) {
-                if (iterator instanceof PBuiltinIterator) {
-                    PBuiltinIterator pbi = (PBuiltinIterator) iterator;
+                if (iterator instanceof PBuiltinIterator pbi) {
                     if (GetPythonObjectClassNode.executeUncached(pbi) == PythonBuiltinClassType.PIterator && pbi.index == 0 && !pbi.isExhausted()) {
                         SequenceStorage s = GetInternalIteratorSequenceStorage.executeUncached(pbi);
                         if (s != null) {
-                            return s.copy();
+                            return SequenceStorageNodes.CopyNode.executeUncached(s);
                         }
                     }
                 }

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

@@ -38,6 +38,8 @@ public abstract class BasicSequenceStorage extends SequenceStorage {
 
     public abstract void reverse();
 
+    public abstract SequenceStorage copy();
+
     public abstract Object getCopyOfInternalArrayObject();
 
     public abstract void setInternalArrayObject(Object arrayObject);
@@ -63,7 +65,6 @@ private static int capacityFor(int length) throws ArithmeticException {
      * Ensure that the current capacity is big enough. If not, we increase capacity to the next
      * designated size (not necessarily the requested one).
      */
-    @Override
     public final void ensureCapacity(int newCapacity) throws ArithmeticException {
         if (CompilerDirectives.injectBranchProbability(CompilerDirectives.UNLIKELY_PROBABILITY, newCapacity > capacity)) {
             increaseCapacityExactWithCopy(capacityFor(newCapacity));

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

@@ -25,16 +25,11 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
-import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
-
 import java.nio.ByteOrder;
 
 import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAccessLibrary;
-import com.oracle.graal.python.nodes.ErrorMessages;
-import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 
@@ -77,11 +72,6 @@ public Object getIndicativeValue() {
         return null;
     }
 
-    @Override
-    public SequenceStorage copy() {
-        return this;
-    }
-
     @Override
     public Object[] getInternalArray() {
         return PythonUtils.EMPTY_OBJECT_ARRAY;
@@ -103,11 +93,6 @@ public boolean equals(SequenceStorage other) {
         return other == EmptySequenceStorage.INSTANCE;
     }
 
-    @Override
-    public void ensureCapacity(int newCapacity) {
-
-    }
-
     @Override
     public Object getInternalArrayObject() {
         return null;

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

@@ -47,7 +47,6 @@
 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.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleLogger;
 
 public abstract class NativeSequenceStorage extends SequenceStorage {
@@ -62,15 +61,10 @@ public abstract class NativeSequenceStorage extends SequenceStorage {
         super(length, capacity);
         this.ptr = ptr;
         if (LOGGER.isLoggable(Level.FINE)) {
-            LOGGER.fine(PythonUtils.formatJString("new %s", toJString()));
+            LOGGER.fine(PythonUtils.formatJString("new %s", this));
         }
     }
 
-    @TruffleBoundary
-    private String toJString() {
-        return toString();
-    }
-
     public final Object getPtr() {
         return ptr;
     }
@@ -103,16 +97,6 @@ public final void setNewLength(int length) {
         }
     }
 
-    @Override
-    public final void ensureCapacity(int newCapacity) {
-        throw CompilerDirectives.shouldNotReachHere();
-    }
-
-    @Override
-    public final SequenceStorage copy() {
-        throw CompilerDirectives.shouldNotReachHere();
-    }
-
     @Override
     public final Object[] getInternalArray() {
         throw CompilerDirectives.shouldNotReachHere();

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

@@ -77,8 +77,6 @@ public final int getCapacity() {
         return capacity;
     }
 
-    public abstract SequenceStorage copy();
-
     /**
      * Get internal array object without copying. Note: The length must be taken from the sequence
      * storage object.
@@ -98,6 +96,4 @@ public final int getCapacity() {
     public abstract SequenceStorage generalizeFor(Object value, SequenceStorage other);
 
     public abstract Object getIndicativeValue();
-
-    public abstract void ensureCapacity(int newCapacity);
 }