refactor: remove getItemNormalized from BasicSequenceStorage

horakivo · horakivo · commit 2a26b6a86bf5 · 2024-06-07T00:36:23.000+02:00
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/SequenceStorageTests.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/SequenceStorageTests.java
@@ -40,9 +40,9 @@ private static Object[] getObjectValues() {
     @Test
     public void objectsGetAndSet() {
         ObjectSequenceStorage store = new ObjectSequenceStorage(getObjectValues());
-        assertEquals(4, store.getItemNormalized(3));
+        assertEquals(4, store.getObjectItemNormalized(3));
         store.setItemNormalized(5, 10);
-        assertEquals(10, store.getItemNormalized(5));
+        assertEquals(10, store.getObjectItemNormalized(5));
     }
 
     /**
@@ -55,8 +55,8 @@ private static int[] getIntValues() {
     @Test
     public void intGetAndSet() throws SequenceStoreException {
         IntSequenceStorage store = new IntSequenceStorage(getIntValues());
-        assertEquals(4, store.getItemNormalized(3));
+        assertEquals(4, store.getIntItemNormalized(3));
         store.setItemNormalized(5, 10);
-        assertEquals(10, store.getItemNormalized(5));
+        assertEquals(10, store.getIntItemNormalized(5));
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsModuleBuiltins.java
@@ -1086,7 +1086,7 @@ Object forget(VirtualFrame frame, PBytesLike encoding,
                         @Cached AsciiDecodeNode asciiDecodeNode) {
             PTuple decodeResult = (PTuple) asciiDecodeNode.execute(frame, encoding, PNone.NO_VALUE);
             ObjectSequenceStorage resultStorage = (ObjectSequenceStorage) decodeResult.getSequenceStorage();
-            forget((TruffleString) resultStorage.getItemNormalized(0));
+            forget((TruffleString) resultStorage.getObjectItemNormalized(0));
             return PNone.NONE;
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java
@@ -1103,7 +1103,7 @@ private static Object[] collect(MroSequenceStorage mro, int idx) {
             ArrayList<Object> l = new ArrayList<>();
             int mroLength = mro.length();
             for (int i = 0; i < mroLength; i++) {
-                PythonAbstractClass kls = mro.getItemNormalized(i);
+                PythonAbstractClass kls = mro.getPythonClassItemNormalized(i);
                 Object value = HiddenAttr.ReadNode.executeUncached((PythonAbstractObject) kls, NATIVE_SLOTS, null);
                 if (value != null) {
                     Object[] tuple = (Object[]) value;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/jni/GraalHPyJNIContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/jni/GraalHPyJNIContext.java
@@ -1872,7 +1872,7 @@ public long ctxGetItemi(long hCollection, long lidx) {
                     }
                     return GraalHPyBoxing.boxHandle(context.getHPyHandleForObject(lresult));
                 } else if (storage instanceof ObjectSequenceStorage) {
-                    Object result = ((ObjectSequenceStorage) storage).getItemNormalized(idx);
+                    Object result = ((ObjectSequenceStorage) storage).getObjectItemNormalized(idx);
                     if (result instanceof Integer) {
                         return GraalHPyBoxing.boxInt((int) result);
                     } else if (result instanceof Double) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java
@@ -540,12 +540,12 @@ protected static double doDouble(DoubleSequenceStorage storage, int idx) {
 
         @Specialization
         protected static Object doObject(ObjectSequenceStorage storage, int idx) {
-            return storage.getItemNormalized(idx);
+            return storage.getObjectItemNormalized(idx);
         }
 
         @Specialization
         protected static Object doMro(MroSequenceStorage storage, int idx) {
-            return storage.getItemNormalized(idx);
+            return storage.getPythonClassItemNormalized(idx);
         }
 
         @InliningCutoff
@@ -2457,7 +2457,7 @@ ObjectSequenceStorage doObjectSingleElement(ObjectSequenceStorage s, int times,
                         @Shared @Cached PRaiseNode raiseNode) {
             try {
                 Object[] repeated = new Object[PythonUtils.multiplyExact(s.length(), times)];
-                Arrays.fill(repeated, s.getItemNormalized(0));
+                Arrays.fill(repeated, s.getObjectItemNormalized(0));
                 return new ObjectSequenceStorage(repeated);
             } catch (OutOfMemoryError e) {
                 throw raiseNode.raise(MemoryError);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/PBaseException.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/PBaseException.java
@@ -46,6 +46,7 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.GetItemScalarNode;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.traceback.LazyTraceback;
@@ -64,7 +65,6 @@
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.formatting.ErrorMessageFormatter;
-import com.oracle.graal.python.runtime.sequence.storage.BasicSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerAsserts;
@@ -251,7 +251,7 @@ public String getFormattedMessage() {
             return typeName;
         } else if (args.getSequenceStorage().length() == 1) {
             SequenceStorage store = args.getSequenceStorage();
-            Object item = store instanceof BasicSequenceStorage basicStorage ? basicStorage.getItemNormalized(0) : "<unknown>";
+            Object item = GetItemScalarNode.executeUncached(store, 0);
             return typeName + ": " + item.toString();
         } else {
             return typeName + ": " + args.toString();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/IteratorBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/IteratorBuiltins.java
@@ -170,7 +170,7 @@ static Object next(Node inliningTarget, PIntegerSequenceIterator self, boolean t
         static Object next(Node inliningTarget, PObjectSequenceIterator self, boolean throwStopIteration,
                         @Exclusive @Cached PRaiseNode.Lazy raiseNode) {
             if (self.getIndex() < self.sequence.length()) {
-                return self.sequence.getItemNormalized(self.index++);
+                return self.sequence.getObjectItemNormalized(self.index++);
             }
             return stopIteration(inliningTarget, self, throwStopIteration, raiseNode);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/PObjectSequenceIterator.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/PObjectSequenceIterator.java
@@ -39,7 +39,7 @@ public PObjectSequenceIterator(Object clazz, Shape instanceShape, ObjectSequence
 
     public Object next() {
         assert hasNext();
-        return this.sequence.getItemNormalized(this.index++);
+        return this.sequence.getObjectItemNormalized(this.index++);
     }
 
     @Override
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/MroShape.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/MroShape.java
@@ -94,7 +94,7 @@ public static MroShape create(MroSequenceStorage mro, PythonLanguage lang) {
         CompilerAsserts.neverPartOfCompilation();
         MroShape mroShape = lang.getMroShapeRoot();
         for (int i = mro.length() - 1; i >= 0; i--) {
-            PythonAbstractClass element = mro.getItemNormalized(i);
+            PythonAbstractClass element = mro.getPythonClassItemNormalized(i);
             if (PythonManagedClass.isInstance(element)) {
                 PythonManagedClass managedClass = PythonManagedClass.cast(element);
                 if (GetDictIfExistsNode.getUncached().execute(managedClass) != null) {
@@ -152,7 +152,7 @@ public Object getFromMro(MroSequenceStorage mro, TruffleString key) {
             if (mroIndex == NOT_FOUND_INDEX) {
                 return PNone.NO_VALUE;
             } else {
-                Object item = mro.getItemNormalized(mroIndex);
+                PythonAbstractClass item = mro.getPythonClassItemNormalized(mroIndex);
                 if (!(item instanceof PythonObject)) {
                     // MroShape should only contain PythonManagedClass
                     transferToInterpreterAndInvalidate();
@@ -197,7 +197,7 @@ public static boolean validate(Object obj, PythonLanguage language) {
         }
         MroShape mroShape = klass.getMroShape();
         for (int i = 0; i < mro.length(); i++) {
-            if (!(mro.getItemNormalized(i) instanceof PythonManagedClass)) {
+            if (!(mro.getPythonClassItemNormalized(i) instanceof PythonManagedClass)) {
                 // If there is a non-managed class, we give up on maintaining an MRO shape
                 assert mroShape == null : mro.getClassName();
                 return true;
@@ -209,7 +209,7 @@ public static boolean validate(Object obj, PythonLanguage language) {
         }
         MroShape currMroShape = mroShape;
         for (int i = 0; i < mro.length(); i++) {
-            PythonManagedClass kls = (PythonManagedClass) mro.getItemNormalized(i);
+            PythonManagedClass kls = (PythonManagedClass) mro.getPythonClassItemNormalized(i);
             if (kls.getShape() != currMroShape.shape) {
                 String message = String.format("mro:%s,index:%d,curr klass:%s\nactual shape:\n%s,\nexpected shape:\n%s",
                                 mro.getClassName(), i, kls, kls.getShape(), currMroShape.shape);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonClass.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonClass.java
@@ -271,7 +271,7 @@ private void reinitializeMroShape(PythonLanguage language) {
         if (mroShape != null) {
             // add this class as a subtype of all classes in the mro (including itself)
             mroLoop: for (int mroIdx = 0; mroIdx < mro.length(); mroIdx++) {
-                PythonManagedClass managedClass = (PythonManagedClass) mro.getItemNormalized(mroIdx);
+                PythonManagedClass managedClass = (PythonManagedClass) mro.getPythonClassItemNormalized(mroIdx);
                 if (managedClass instanceof PythonBuiltinClass) {
                     // builtin classes are assumed immutable, so we do not need to register in their
                     // mro subtypes array (in fact they do not have such array)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/SpecialMethodSlot.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/SpecialMethodSlot.java
@@ -527,8 +527,8 @@ private static Object[] initializeSpecialMethodsSlots(PythonManagedClass klass,
         // we can just "extend" the slots of B with the new overrides in A. This fast-path seem to
         // handle large majority of the situations
         if (mro.length() >= 2 && klass.getBaseClasses().length <= 1) {
-            PythonAbstractClass firstType = mro.getItemNormalized(0);
-            PythonAbstractClass secondType = mro.getItemNormalized(1);
+            PythonAbstractClass firstType = mro.getPythonClassItemNormalized(0);
+            PythonAbstractClass secondType = mro.getPythonClassItemNormalized(1);
             if (firstType == klass && PythonManagedClass.isInstance(secondType)) {
                 PythonManagedClass managedBase = PythonManagedClass.cast(secondType);
                 if (managedBase.specialMethodSlots != null) {
@@ -553,7 +553,7 @@ private static Object[] initializeSpecialMethodsSlots(PythonManagedClass klass,
         // Check the last klass in MRO and use copy its slots for the beginning (if available)
         // In most cases this will be `object`, which contains most of the slots
         Object[] slots = null;
-        PythonAbstractClass lastType = mro.getItemNormalized(mro.length() - 1);
+        PythonAbstractClass lastType = mro.getPythonClassItemNormalized(mro.length() - 1);
         boolean slotsInitializedFromLast = false;
         if (PythonManagedClass.isInstance(lastType)) {
             PythonManagedClass lastClass = PythonManagedClass.cast(lastType);
@@ -570,7 +570,7 @@ private static Object[] initializeSpecialMethodsSlots(PythonManagedClass klass,
         // Traverse MRO in reverse order overriding the initial slots values if we find new override
         int skip = slotsInitializedFromLast ? 1 : 0;
         for (int i = mro.length() - skip - 1; i >= 0; i--) {
-            PythonAbstractClass base = mro.getItemNormalized(i);
+            PythonAbstractClass base = mro.getPythonClassItemNormalized(i);
             if (PythonManagedClass.isInstance(base)) {
                 setSlotsFromManaged(slots, PythonManagedClass.cast(base), language);
             } else {
@@ -591,7 +591,7 @@ private static boolean isMroSubtype(MroSequenceStorage superTypeMro, PythonManag
         boolean isMroSubtype = subTypeMro.length() == superTypeMro.length() - 1;
         if (isMroSubtype) {
             for (int i = 0; i < subTypeMro.length(); i++) {
-                if (superTypeMro.getItemNormalized(i + 1) != subTypeMro.getItemNormalized(i)) {
+                if (superTypeMro.getPythonClassItemNormalized(i + 1) != subTypeMro.getPythonClassItemNormalized(i)) {
                     isMroSubtype = false;
                     break;
                 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TpSlots.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TpSlots.java
@@ -605,7 +605,7 @@ public static void inherit(PythonClass klass, MroSequenceStorage mro) {
         assert klass.getTpSlots() == null;
         Builder klassSlots = newBuilder();
         for (int i = 0; i < mro.length(); i++) {
-            PythonAbstractClass type = mro.getItemNormalized(i);
+            PythonAbstractClass type = mro.getPythonClassItemNormalized(i);
             TpSlots slots = GetTpSlotsNode.executeUncached(type);
             assert slots != null || type == klass;
             if (slots != null) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupAttributeInMRONode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupAttributeInMRONode.java
@@ -259,7 +259,7 @@ protected AttributeAssumptionPair findAttrAndAssumptionInMRO(Object klass) {
         MroSequenceStorage mro = getMro(klass);
         Assumption attrAssumption = mro.createAttributeInMROFinalAssumption(key);
         for (int i = 0; i < mro.length(); i++) {
-            PythonAbstractClass clsObj = mro.getItemNormalized(i);
+            PythonAbstractClass clsObj = mro.getPythonClassItemNormalized(i);
             if (i > 0) {
                 assert clsObj != klass : "MRO chain is incorrect: '" + klass + "' was found at position " + i;
                 getMro(clsObj).addAttributeInMROFinalAssumption(key, attrAssumption);
@@ -324,7 +324,7 @@ protected Object lookupConstantMRO(@SuppressWarnings("unused") Object klass,
                     @Exclusive @CachedLibrary(limit = "1") DynamicObjectLibrary dylib,
                     @Cached("create(mroLength)") ReadAttributeFromObjectNode[] readAttrNodes) {
         for (int i = 0; i < mroLength; i++) {
-            Object kls = mro.getItemNormalized(i);
+            Object kls = mro.getPythonClassItemNormalized(i);
             if (skipNonStaticBase(kls, skipNonStaticBases, dylib)) {
                 continue;
             }
@@ -348,7 +348,7 @@ protected Object lookupCachedLen(@SuppressWarnings("unused") Object klass,
                     @Exclusive @CachedLibrary(limit = "1") DynamicObjectLibrary dylib,
                     @Cached("create(cachedMroLength)") ReadAttributeFromObjectNode[] readAttrNodes) {
         for (int i = 0; i < cachedMroLength; i++) {
-            Object kls = mro.getItemNormalized(i);
+            Object kls = mro.getPythonClassItemNormalized(i);
             if (skipNonStaticBase(kls, skipNonStaticBases, dylib)) {
                 continue;
             }
@@ -388,7 +388,7 @@ public static Object lookupSlowPath(Object klass, TruffleString key) {
 
     public static Object lookup(TruffleString key, MroSequenceStorage mro, ReadAttributeFromObjectNode readAttrNode, boolean skipNonStaticBases, DynamicObjectLibrary dylib) {
         for (int i = 0; i < mro.length(); i++) {
-            Object kls = mro.getItemNormalized(i);
+            Object kls = mro.getPythonClassItemNormalized(i);
             if (skipNonStaticBase(kls, skipNonStaticBases, dylib)) {
                 continue;
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupNativeSlotNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupNativeSlotNode.java
@@ -91,7 +91,7 @@ public static Object executeUncached(PythonManagedClass klass, SlotMethodDef slo
         var overlappingSlot = slot.overlappingSlot;
         Object foundNativeSlotOverlap = null;
         for (int i = 0; i < mro.length(); i++) {
-            PythonAbstractClass kls = mro.getItemNormalized(i);
+            PythonAbstractClass kls = mro.getPythonClassItemNormalized(i);
             Object value = readSlot(slot, kls, readAttrNode, readPointerNode, interopLibrary);
             if (value != null) {
                 if (foundNativeSlotOverlap != null && kls instanceof PythonManagedClass) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BasicSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BasicSequenceStorage.java
@@ -25,12 +25,8 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
-import com.oracle.truffle.api.CompilerAsserts;
-
 public abstract class BasicSequenceStorage extends SequenceStorage {
 
-    public abstract Object getItemNormalized(int idx);
-
     public abstract void setItemNormalized(int idx, Object value) throws SequenceStoreException;
 
     public final void setNewLength(int length) {
@@ -53,19 +49,4 @@ protected static int capacityFor(int length) throws ArithmeticException {
     public void minimizeCapacity() {
         capacity = length;
     }
-
-    @Override
-    public String toString() {
-        CompilerAsserts.neverPartOfCompilation();
-        StringBuilder str = new StringBuilder(getClass().getSimpleName()).append('[');
-        int len = length > 10 ? 10 : length;
-        for (int i = 0; i < len; i++) {
-            str.append(i == 0 ? "" : ", ");
-            str.append(getItemNormalized(i));
-        }
-        if (length > 10) {
-            str.append("...").append('(').append(length).append(')');
-        }
-        return str.append(']').toString();
-    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BoolSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BoolSequenceStorage.java
@@ -99,11 +99,6 @@ public boolean[] getInternalBoolArray() {
         return values;
     }
 
-    @Override
-    public Object getItemNormalized(int idx) {
-        return getBoolItemNormalized(idx);
-    }
-
     public boolean getBoolItemNormalized(int idx) {
         return values[idx];
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ByteSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ByteSequenceStorage.java
@@ -91,11 +91,6 @@ public void reverse() {
         }
     }
 
-    @Override
-    public Object getItemNormalized(int idx) {
-        return getIntItemNormalized(idx);
-    }
-
     public byte getByteItemNormalized(int idx) {
         return values[idx];
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/DoubleSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/DoubleSequenceStorage.java
@@ -89,11 +89,6 @@ public double[] getInternalDoubleArray() {
         return values;
     }
 
-    @Override
-    public Object getItemNormalized(int idx) {
-        return getDoubleItemNormalized(idx);
-    }
-
     public double getDoubleItemNormalized(int idx) {
         return values[idx];
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/IntSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/IntSequenceStorage.java
@@ -89,11 +89,6 @@ public int[] getInternalIntArray() {
         return values;
     }
 
-    @Override
-    public Object getItemNormalized(int idx) {
-        return getIntItemNormalized(idx);
-    }
-
     public int getIntItemNormalized(int idx) {
         return values[idx];
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/LongSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/LongSequenceStorage.java
@@ -90,11 +90,6 @@ public long[] getInternalLongArray() {
         return values;
     }
 
-    @Override
-    public Object getItemNormalized(int idx) {
-        return getLongItemNormalized(idx);
-    }
-
     public long getLongItemNormalized(int idx) {
         return values[idx];
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/MroSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/MroSequenceStorage.java
@@ -103,8 +103,7 @@ public MroSequenceStorage(TruffleString className, int capacity) {
         this.attributesInMROFinalAssumptions = new HashMap<>();
     }
 
-    @Override
-    public PythonAbstractClass getItemNormalized(int idx) {
+    public PythonAbstractClass getPythonClassItemNormalized(int idx) {
         return values[idx];
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ObjectSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ObjectSequenceStorage.java
@@ -57,8 +57,7 @@ public ObjectSequenceStorage(int capacity) {
         this.length = 0;
     }
 
-    @Override
-    public Object getItemNormalized(int idx) {
+    public Object getObjectItemNormalized(int idx) {
         return values[idx];
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/SequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/SequenceStorage.java
@@ -25,6 +25,9 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.GetItemScalarNode;
+import com.oracle.truffle.api.CompilerAsserts;
+
 public abstract class SequenceStorage {
 
     public enum StorageType {
@@ -80,4 +83,19 @@ public final int getCapacity() {
     public abstract StorageType getElementType();
 
     public abstract Object getIndicativeValue();
+
+    @Override
+    public String toString() {
+        CompilerAsserts.neverPartOfCompilation();
+        StringBuilder str = new StringBuilder(getClass().getSimpleName()).append('[');
+        int len = length > 10 ? 10 : length;
+        for (int i = 0; i < len; i++) {
+            str.append(i == 0 ? "" : ", ");
+            str.append(GetItemScalarNode.executeUncached(this, i));
+        }
+        if (length > 10) {
+            str.append("...").append('(').append(length).append(')');
+        }
+        return str.append(']').toString();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1086,7 +1086,7 @@ Object forget(VirtualFrame frame, PBytesLike encoding,`
`1086`	`1086`	`@Cached AsciiDecodeNode asciiDecodeNode) {`
`1087`	`1087`	`PTuple decodeResult = (PTuple) asciiDecodeNode.execute(frame, encoding, PNone.NO_VALUE);`
`1088`	`1088`	`ObjectSequenceStorage resultStorage = (ObjectSequenceStorage) decodeResult.getSequenceStorage();`
`1089`		`- forget((TruffleString) resultStorage.getItemNormalized(0));`
	`1089`	`+ forget((TruffleString) resultStorage.getObjectItemNormalized(0));`
`1090`	`1090`	`return PNone.NONE;`
`1091`	`1091`	`}`
`1092`	`1092`
Original file line number	Diff line number	Diff line change
`@@ -1872,7 +1872,7 @@ public long ctxGetItemi(long hCollection, long lidx) {`
`1872`	`1872`	`}`
`1873`	`1873`	`return GraalHPyBoxing.boxHandle(context.getHPyHandleForObject(lresult));`
`1874`	`1874`	`} else if (storage instanceof ObjectSequenceStorage) {`
`1875`		`- Object result = ((ObjectSequenceStorage) storage).getItemNormalized(idx);`
	`1875`	`+ Object result = ((ObjectSequenceStorage) storage).getObjectItemNormalized(idx);`
`1876`	`1876`	`if (result instanceof Integer) {`
`1877`	`1877`	`return GraalHPyBoxing.boxInt((int) result);`
`1878`	`1878`	`} else if (result instanceof Double) {`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ static Object next(Node inliningTarget, PIntegerSequenceIterator self, boolean t`
`170`	`170`	`static Object next(Node inliningTarget, PObjectSequenceIterator self, boolean throwStopIteration,`
`171`	`171`	`@Exclusive @Cached PRaiseNode.Lazy raiseNode) {`
`172`	`172`	`if (self.getIndex() < self.sequence.length()) {`
`173`		`- return self.sequence.getItemNormalized(self.index++);`
	`173`	`+ return self.sequence.getObjectItemNormalized(self.index++);`
`174`	`174`	`}`
`175`	`175`	`return stopIteration(inliningTarget, self, throwStopIteration, raiseNode);`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public PObjectSequenceIterator(Object clazz, Shape instanceShape, ObjectSequence`
`39`	`39`
`40`	`40`	`public Object next() {`
`41`	`41`	`assert hasNext();`
`42`		`- return this.sequence.getItemNormalized(this.index++);`
	`42`	`+ return this.sequence.getObjectItemNormalized(this.index++);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`