Fix 'PyList_New': did not properly ensure initial capacity.

Author: fangerer

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

@@ -56,13 +56,14 @@ def _reference_getitem(args):
 
 
 def _reference_setitem(args):
-    listObj = args[0]
+    capacity = args[0]
     pos = args[1]
     newitem = args[2]
     if pos < 0:
         raise IndexError("list index out of range")
+    listObj = [None] * capacity
     listObj[pos] = newitem
-    return 0
+    return listObj
 
 
 def _reference_SET_ITEM(args):
@@ -154,14 +155,27 @@ def compile_module(self, name):
     )
 
     test_PyList_SetItem = CPyExtFunction(
-        _wrap_list_fun(_reference_setitem),
+        _reference_setitem,
         lambda: (
-            ([1,2,3,4], 0, 0),
-            ([1,2,3,4], 3, 5),
+            (4, 0, 0),
+            (4, 3, 5),
         ),
-        resultspec="i",
-        argspec='OnO',
-        arguments=["PyObject* op", "Py_ssize_t size", "PyObject* newitem"],
+        code='''PyObject* wrap_PyList_SetItem(Py_ssize_t capacity, Py_ssize_t idx, PyObject* new_item) {
+            PyObject *newList = PyList_New(capacity);
+            for (Py_ssize_t i = 0; i < capacity; i++) {
+                if (i == idx) {
+                    PyList_SetItem(newList, i, new_item);
+                } else {
+                    PyList_SetItem(newList, i, Py_None);
+                }
+            }
+            return newList;
+        }
+        ''',
+        resultspec="O",
+        argspec='nnO',
+        arguments=["Py_ssize_t capacity", "Py_ssize_t size", "PyObject* new_item"],
+        callfunction="wrap_PyList_SetItem",
         cmpfunc=unhandled_error_compare
     )
 

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

@@ -914,6 +914,16 @@ PList doPListInt(PList left, int right,
             }
         }
 
+        @Specialization(rewriteOn = ArithmeticException.class)
+        PList doPListBigInt(PList left, long right,
+                        @Cached("createClassProfile()") ValueProfile profile) {
+            try {
+                return doPListInt(left, PInt.intValueExact(right), profile);
+            } catch (ArithmeticException e) {
+                throw raise(OverflowError, "cannot fit 'int' into an index-sized integer");
+            }
+        }
+
         @Specialization(rewriteOn = ArithmeticException.class)
         PList doPListBigInt(PList left, PInt right,
                         @Cached("createClassProfile()") ValueProfile profile) {

graalpython/lib-graalpython/python_cext.py

@@ -204,7 +204,7 @@ def PyList_New(size, errormarker):
     try:
         if size < 0:
             _PyErr_BadInternalCall(None, None, None)
-        return []
+        return [None] * size
     except BaseException:
         typ, val, tb = sys.exc_info()
     PyErr_Restore(typ, val, tb)