Fix: Sequence repeat must not generalize.

Author: fangerer

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

@@ -291,7 +291,7 @@ public abstract static class MulNode extends PythonBinaryBuiltinNode {
         @Specialization
         public Object mul(PBytes self, int times,
                         @Cached("create()") SequenceStorageNodes.RepeatNode repeatNode) {
-            ByteSequenceStorage res = (ByteSequenceStorage) repeatNode.execute(self.getSequenceStorage(), times);
+            SequenceStorage res = repeatNode.execute(self.getSequenceStorage(), times);
             return factory().createBytes(res);
         }
 

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

@@ -2156,7 +2156,6 @@ public static ExtendNode create(Supplier<GeneralizationNode> genNodeProvider) {
     public abstract static class RepeatNode extends SequenceStorageBaseNode {
         private static final String ERROR_MSG = "can't multiply sequence by non-int of type '%p'";
 
-        @Child private SetItemScalarNode setItemNode;
         @Child private GetItemScalarNode getItemNode;
         @Child private GetItemScalarNode getRightItemNode;
         @Child private IsIndexNode isIndexNode;
@@ -2174,8 +2173,8 @@ SequenceStorage doEmpty(EmptySequenceStorage s, @SuppressWarnings("unused") int
 
         @Specialization(guards = "times <= 0")
         SequenceStorage doZeroRepeat(SequenceStorage s, @SuppressWarnings("unused") int times,
-                        @Cached("createClassProfile()") ValueProfile storageTypeProfile) {
-            return storageTypeProfile.profile(s).createEmpty(0);
+                        @Cached("create()") CreateEmptyNode createEmptyNode) {
+            return createEmptyNode.execute(s, 0);
         }
 
         @Specialization(limit = "MAX_ARRAY_STORAGES", guards = {"times > 0", "!isNative(s)", "s.getClass() == cachedClass"})
@@ -2200,21 +2199,26 @@ SequenceStorage doManaged(BasicSequenceStorage s, int times,
 
         @Specialization(replaces = "doManaged", guards = "times > 0")
         SequenceStorage doGeneric(SequenceStorage s, int times,
+                        @Cached("create()") CreateEmptyNode createEmptyNode,
                         @Cached("create()") BranchProfile outOfMemProfile,
+                        @Cached("create()") SetItemScalarNode setItemNode,
+                        @Cached("create()") GetItemScalarNode getDestItemNode,
                         @Cached("create()") LenNode lenNode) {
             try {
                 int len = lenNode.execute(s);
+                SequenceStorage repeated = createEmptyNode.execute(s, Math.multiplyExact(len, times));
 
-                ObjectSequenceStorage repeated = new ObjectSequenceStorage(Math.multiplyExact(len, times));
-
-                // TODO avoid temporary array
-                Object[] values = new Object[len];
                 for (int i = 0; i < len; i++) {
-                    values[i] = getGetItemNode().execute(s, i);
+                    setItemNode.execute(repeated, i, getGetItemNode().execute(s, i));
+                }
+
+                // read from destination since that is potentially faster
+                for (int j = 1; j < times; j++) {
+                    for (int i = 0; i < len; i++) {
+                        setItemNode.execute(repeated, j * len + i, getDestItemNode.execute(repeated, i));
+                    }
                 }
 
-                Object destArr = repeated.getInternalArrayObject();
-                repeat(destArr, values, len, times);
                 return repeated;
             } catch (OutOfMemoryError | ArithmeticException e) {
                 outOfMemProfile.enter();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -280,11 +280,11 @@ public PBytes createBytes(LazyPythonClass cls, byte[] array) {
         return trace(new PBytes(cls, array));
     }
 
-    public PBytes createBytes(ByteSequenceStorage storage) {
+    public PBytes createBytes(SequenceStorage storage) {
         return trace(new PBytes(PythonBuiltinClassType.PBytes, storage));
     }
 
-    public PBytes createBytes(LazyPythonClass cls, ByteSequenceStorage storage) {
+    public PBytes createBytes(LazyPythonClass cls, SequenceStorage storage) {
         return trace(new PBytes(cls, storage));
     }