Update primitive for list.pop(n)

Author: JukkaL

mypyc/lib-rt/list_ops.c

@@ -253,7 +253,22 @@ PyObject *CPyList_Pop(PyObject *obj, CPyTagged index)
 {
     if (CPyTagged_CheckShort(index)) {
         Py_ssize_t n = CPyTagged_ShortAsSsize_t(index);
+#ifdef Py_GIL_DISABLED
+        static PyObject *interned_pop_str = NULL;
+        if (!interned_pop_str) {
+            interned_pop_str = PyUnicode_InternFromString("pop");
+            if (!interned_pop_str)
+                return NULL;
+        }
+        PyObject *index_obj = PyLong_FromLong(n);  // New reference
+        if (index_obj == NULL)
+            return NULL;
+        PyObject *result = PyObject_CallMethodOneArg(obj, interned_pop_str, index_obj);
+        Py_DECREF(index_obj);
+        return result;
+#else
         return list_pop_impl((PyListObject *)obj, n);
+#endif
     } else {
         PyErr_SetString(PyExc_OverflowError, CPYTHON_LARGE_INT_ERRMSG);
         return NULL;

mypyc/primitives/list_ops.py

@@ -219,7 +219,7 @@
 )
 
 # list.pop(index)
-list_pop = method_op(
+method_op(
     name="pop",
     arg_types=[list_rprimitive, int_rprimitive],
     return_type=object_rprimitive,

mypyc/test-data/run-lists.test

@@ -150,7 +150,9 @@ print(primes(13))
 \[0, 0, 1, 1]
 \[0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1]
 
-[case testListBuild]
+[case testListPrimitives]
+from testutil import assertRaises
+
 def test_list_build() -> None:
     # Currently LIST_BUILDING_EXPANSION_THRESHOLD equals to 10
     # long list built by list_build_op
@@ -169,9 +171,6 @@ def test_list_build() -> None:
     l3.append('a')
     assert l3 == ['a']
 
-[case testListPrims]
-from typing import List
-
 def test_append() -> None:
     l = [1, 2]
     l.append(10)
@@ -189,10 +188,28 @@ def test_pop_last() -> None:
 
 def test_pop_index() -> None:
     l = [1, 2, 10, 3]
-    l.pop(2)
+    assert l.pop(2) == 10
     assert l == [1, 2, 3]
-    l.pop(-2)
+    assert l.pop(-2) == 2
     assert l == [1, 3]
+    assert l.pop(-2) == 1
+    assert l.pop(0) == 3
+    assert l == []
+    l = [int() + 1000, int() + 1001, int() + 1002]
+    assert l.pop(0) == 1000
+    assert l.pop(-1) == 1002
+    assert l == [1001]
+
+def test_pop_index_errors() -> None:
+    l = [int() + 1000]
+    with assertRaises(IndexError):
+        l.pop(1)
+    with assertRaises(IndexError):
+        l.pop(-2)
+    with assertRaises(OverflowError):
+        l.pop(1 << 100)
+    with assertRaises(OverflowError):
+        l.pop(-(1 << 100))
 
 def test_count() -> None:
     l = [1, 3]