[GR-9663] OutOfMemoryError is thrown when a list is extend.

Author: ppisl

graalpython/com.oracle.graal.python.test/src/tests/list_tests.py

@@ -256,24 +256,24 @@ def test_append(self):
         self.assertEqual(a, self.type2test([0, 1, 2]))
 
         self.assertRaises(TypeError, a.append)
-    '''
+    
     def test_extend(self):
         a1 = self.type2test([0])
         a2 = self.type2test((0, 1))
         a = a1[:]
         a.extend(a2)
         self.assertEqual(a, a1 + a2)
-
+        
         a.extend(self.type2test([]))
         self.assertEqual(a, a1 + a2)
-
+        
         a.extend(a)
         self.assertEqual(a, self.type2test([0, 0, 1, 0, 0, 1]))
-
+        
         a = self.type2test("spam")
         a.extend("eggs")
         self.assertEqual(a, list("spameggs"))
-
+        
         self.assertRaises(TypeError, a.extend, None)
         self.assertRaises(TypeError, a.extend)
 
@@ -288,7 +288,7 @@ def __length_hint__(self):
         a = self.type2test([1,2,3,4])
         a.extend(CustomIter())
         self.assertEqual(a, [1,2,3,4])
-    '''
+    '''    
     def test_insert(self):
         a = self.type2test([0, 1, 2])
         a.insert(0, -2)

graalpython/com.oracle.graal.python.test/src/tests/test_list.py

@@ -280,6 +280,16 @@ def test_set_slice_generalize_storage(self):
         a[1:5] = [1.1, 2.2, 3.3]
         self.assertEqual([1,1.1, 2.2, 3.3], a)
 
+    def test_extend_spec(self):
+        a = [1,2]
+        a.extend(a)
+        self.assertEqual([1,2,1,2], a)
+        a = [923123123123]
+        a.extend(a)
+        self.assertEqual([923123123123,923123123123], a)
+        a = [1.1, 2.1]
+        a.extend(a)
+        self.assertEqual([1.1, 2.1, 1.1, 2.1], a)
     def test_remove_spec(self):
         a = [1,2]
         a.remove(2);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java

@@ -477,24 +477,96 @@ protected boolean isKnownStorage(PList list) {
     @GenerateNodeFactory
     public abstract static class ListExtendNode extends PythonBuiltinNode {
 
-        @Specialization
-        public PList extend(PList list, Object source,
+        @Specialization(guards = {"isIntStorage(list)", "isIntStorage(source)"})
+        public PNone extendIntInt(PList list, PList source) {
+            IntSequenceStorage target = (IntSequenceStorage) list.getSequenceStorage();
+            IntSequenceStorage what = list != source
+                            ? (IntSequenceStorage) source.getSequenceStorage()
+                            : (IntSequenceStorage) source.getSequenceStorage().copy();
+            int[] array = what.getInternalIntArray();
+            for (int i = 0; i < what.length(); i++) {
+                target.appendInt(array[i]);
+            }
+            return PNone.NONE;
+        }
+
+        @Specialization(guards = {"isLongStorage(list)", "isIntStorage(source)"})
+        public PNone extendLongInt(PList list, PList source) {
+            LongSequenceStorage target = (LongSequenceStorage) list.getSequenceStorage();
+            IntSequenceStorage what = list != source
+                            ? (IntSequenceStorage) source.getSequenceStorage()
+                            : (IntSequenceStorage) source.getSequenceStorage().copy();
+            int[] array = what.getInternalIntArray();
+            for (int i = 0; i < what.length(); i++) {
+                target.appendLong(array[i]);
+            }
+            return PNone.NONE;
+        }
+
+        @Specialization(guards = {"isLongStorage(list)", "isLongStorage(source)"})
+        public PNone extendLongLong(PList list, PList source) {
+            LongSequenceStorage target = (LongSequenceStorage) list.getSequenceStorage();
+            LongSequenceStorage what = list != source
+                            ? (LongSequenceStorage) source.getSequenceStorage()
+                            : (LongSequenceStorage) source.getSequenceStorage().copy();
+            long[] array = what.getInternalLongArray();
+            for (int i = 0; i < what.length(); i++) {
+                target.appendLong(array[i]);
+            }
+            return PNone.NONE;
+        }
+
+        @Specialization(guards = {"isDoubleStorage(list)", "isDoubleStorage(source)"})
+        public PNone extendDoubleDouble(PList list, PList source) {
+            DoubleSequenceStorage target = (DoubleSequenceStorage) list.getSequenceStorage();
+            DoubleSequenceStorage what = list != source
+                            ? (DoubleSequenceStorage) source.getSequenceStorage()
+                            : (DoubleSequenceStorage) source.getSequenceStorage().copy();
+            double[] array = what.getInternalDoubleArray();
+            for (int i = 0; i < what.length(); i++) {
+                target.appendDouble(array[i]);
+            }
+            return PNone.NONE;
+        }
+
+        @Specialization(guards = {"isObjectStorage(list)", "isObjectStorage(source)"})
+        public PNone extendObjectObject(PList list, PList source) {
+            ObjectSequenceStorage target = (ObjectSequenceStorage) list.getSequenceStorage();
+            ObjectSequenceStorage what = list != source
+                            ? (ObjectSequenceStorage) source.getSequenceStorage()
+                            : (ObjectSequenceStorage) source.getSequenceStorage().copy();
+            Object[] array = what.getInternalArray();
+            for (int i = 0; i < what.length(); i++) {
+                target.append(array[i]);
+            }
+            return PNone.NONE;
+        }
+
+        @Specialization(guards = "isNotSpecialCase(list, source)")
+        public PNone extend(PList list, Object source,
                         @Cached("create()") GetIteratorNode getIterator,
                         @Cached("create()") GetNextNode next,
                         @Cached("createBinaryProfile()") ConditionProfile errorProfile) {
 
-            Object iterator = getIterator.executeWith(source);
+            Object workSource = list != source ? source : factory().createList(((PList) source).getSequenceStorage().copy());
+            Object iterator = getIterator.executeWith(workSource);
             while (true) {
                 Object value;
                 try {
                     value = next.execute(iterator);
                 } catch (PException e) {
                     e.expectStopIteration(getCore(), errorProfile);
-                    return list;
+                    return PNone.NONE;
                 }
                 list.append(value);
             }
         }
+
+        protected boolean isNotSpecialCase(PList list, Object source) {
+            return !(source instanceof PList && (((PGuards.isIntStorage(list) || PGuards.isLongStorage(list)) && PGuards.isIntStorage((PList) source)) ||
+                            (PGuards.isLongStorage(list) && PGuards.isLongStorage((PList) source)) || (PGuards.isDoubleStorage(list) && PGuards.isDoubleStorage((PList) source)) ||
+                            (PGuards.isObjectStorage(list) && PGuards.isObjectStorage((PList) source))));
+        }
     }
 
     // list.insert(i, x)