feat: addressing review comments

Author: horakivo

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

@@ -40,7 +40,6 @@
 import static com.oracle.graal.python.runtime.sequence.storage.SequenceStorage.StorageType.Uninitialized;
 
 import java.lang.reflect.Array;
-import java.math.BigInteger;
 import java.util.Arrays;
 
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
@@ -703,7 +702,7 @@ protected static SequenceStorage doMroSequenceStorage(MroSequenceStorage storage
                 newArray[j] = values[i];
             }
 
-            return new MroSequenceStorage(storage.getClassName(), newArray);
+            return new ObjectSequenceStorage(newArray);
         }
 
         @Specialization
@@ -3153,7 +3152,7 @@ static SequenceStorage doObject(ObjectSequenceStorage storage) {
 
         @Specialization
         static SequenceStorage doMro(MroSequenceStorage storage) {
-            return new MroSequenceStorage(storage.getClassName(), PythonUtils.arrayCopyOf(storage.getInternalClassArray(), storage.length()));
+            return new ObjectSequenceStorage(PythonUtils.arrayCopyOf(storage.getInternalClassArray(), storage.length()));
         }
 
         @Specialization
@@ -3221,7 +3220,7 @@ static Object[] doBool(BoolSequenceStorage storage) {
 
         @Specialization
         static Object[] doMro(MroSequenceStorage storage) {
-            throw CompilerDirectives.shouldNotReachHere();
+            return storage.getCopyOfInternalArray();
         }
 
         @Specialization
@@ -3614,7 +3613,7 @@ static Object[] doMroSequenceStorage(MroSequenceStorage s) {
             return s.getInternalClassArray();
         }
 
-        @Specialization(guards = "!isObjectStorage(s) || isMroStorage(s)")
+        @Specialization(guards = {"!isObjectStorage(s)", "!isMroStorage(s)"})
         static Object[] doArrayBasedSequenceStorage(Node inliningTarget, ArrayBasedSequenceStorage s,
                         @Cached CopyInternalArrayNode copy) {
             Object[] internalArray = copy.execute(inliningTarget, s);
@@ -3633,7 +3632,7 @@ static Object[] doEmptySequenceStorage(@SuppressWarnings("unused") EmptySequence
             return PythonUtils.EMPTY_OBJECT_ARRAY;
         }
 
-        @Specialization(replaces = {"doObjectSequenceStorage", "doArrayBasedSequenceStorage", "doNativeObject", "doEmptySequenceStorage"})
+        @Specialization(guards = {"!isObjectStorage(s)", "!isMroStorage(s)"}, replaces = {"doArrayBasedSequenceStorage", "doNativeObject", "doEmptySequenceStorage"})
         static Object[] doGeneric(Node inliningTarget, SequenceStorage s,
                         @Exclusive @Cached GetItemScalarNode getItemNode) {
             return materializeGeneric(inliningTarget, s, s.length(), getItemNode);
@@ -3647,11 +3646,11 @@ private static Object[] materializeGeneric(Node inliningTarget, SequenceStorage
             return barr;
         }
 
-        protected static boolean isObjectStorage(ArrayBasedSequenceStorage storage) {
+        protected static boolean isObjectStorage(SequenceStorage storage) {
             return storage instanceof ObjectSequenceStorage;
         }
 
-        protected static boolean isMroStorage(ArrayBasedSequenceStorage storage) {
+        protected static boolean isMroStorage(SequenceStorage storage) {
             return storage instanceof MroSequenceStorage;
         }
     }
@@ -3691,6 +3690,7 @@ static boolean isObjectSequenceStorage(SequenceStorage s) {
 
     @GenerateUncached
     @GenerateInline
+    @ImportStatic(PInt.class)
     public abstract static class InsertItemArrayBasedStorageNode extends Node {
 
         public static SequenceStorage executeUncached(ArrayBasedSequenceStorage storage, int index, Object value) {
@@ -3723,9 +3723,9 @@ static SequenceStorage doIntWithLongStorage(LongSequenceStorage storage, int idx
             return storage;
         }
 
-        @Specialization
-        static SequenceStorage doBigIntWithLongStorage(LongSequenceStorage storage, int idx, BigInteger value) {
-            storage.insertLongItem(idx, PInt.longValue(value));
+        @Specialization(guards = "isIntRange(value)")
+        static SequenceStorage doLongWithIntStorage(IntSequenceStorage storage, int idx, long value) {
+            storage.insertIntItem(idx, (int) value);
             return storage;
         }
 
@@ -3735,12 +3735,6 @@ static SequenceStorage doByteWithByteStorage(ByteSequenceStorage storage, int id
             return storage;
         }
 
-        @Specialization
-        static SequenceStorage doIntWithByteStorage(ByteSequenceStorage storage, int idx, int value) {
-            storage.insertByteItem(idx, (byte) value);
-            return storage;
-        }
-
         @Specialization
         static SequenceStorage doBoolStorage(BoolSequenceStorage storage, int idx, boolean value) {
             storage.insertBoolItem(idx, value);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/IteratorBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2024, Oracle and/or its affiliates.
  * Copyright (c) 2014, Regents of the University of California
  *
  * All rights reserved.

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/PObjectSequenceIterator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2024, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.

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

@@ -41,14 +41,14 @@
 package com.oracle.graal.python.runtime.sequence.storage;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
 
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
+import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -132,7 +132,11 @@ public Object getInternalArrayObject() {
 
     @Override
     public Object getCopyOfInternalArrayObject() {
-        return Arrays.copyOf(values, length);
+        return getCopyOfInternalArray();
+    }
+
+    public Object[] getCopyOfInternalArray() {
+        return PythonUtils.arrayCopyOf(values, length);
     }
 
     @SuppressWarnings("unused")