optimize this

Author: undingen

src/capi/abstract.cpp

@@ -2464,4 +2464,34 @@ extern "C" Py_ssize_t PyNumber_AsSsize_t(PyObject* item, PyObject* err) noexcept
     Py_DECREF(value);
     return result;
 }
+
+extern "C" int PyObject_SetItem(PyObject* o, PyObject* key, PyObject* value) noexcept {
+    PyMappingMethods* m;
+
+    if (o == NULL || key == NULL || value == NULL) {
+        null_error();
+        return -1;
+    }
+    m = o->cls->tp_as_mapping;
+    if (m && m->mp_ass_subscript)
+        return m->mp_ass_subscript(o, key, value);
+
+    if (o->cls->tp_as_sequence) {
+        if (PyIndex_Check(key)) {
+            Py_ssize_t key_value;
+            key_value = PyNumber_AsSsize_t(key, PyExc_IndexError);
+            if (key_value == -1 && PyErr_Occurred())
+                return -1;
+            return PySequence_SetItem(o, key_value, value);
+        } else if (o->cls->tp_as_sequence->sq_ass_item) {
+            type_error("sequence index must be "
+                       "integer, not '%.200s'",
+                       key);
+            return -1;
+        }
+    }
+
+    type_error("'%.200s' object does not support item assignment", o);
+    return -1;
+}
 }

src/runtime/capi.cpp

@@ -472,16 +472,6 @@ extern "C" PyObject* PyObject_GetItem(PyObject* o, PyObject* key) noexcept {
     return getitemInternal<ExceptionStyle::CAPI>(o, key);
 }
 
-extern "C" int PyObject_SetItem(PyObject* o, PyObject* key, PyObject* v) noexcept {
-    try {
-        setitem(o, key, v);
-        return 0;
-    } catch (ExcInfo e) {
-        setCAPIException(e);
-        return -1;
-    }
-}
-
 extern "C" int PyObject_DelItem(PyObject* o, PyObject* key) noexcept {
     try {
         delitem(o, key);

src/runtime/dict.cpp

@@ -258,30 +258,6 @@ extern "C" PyObject* PyDict_New() noexcept {
     return new BoxedDict();
 }
 
-// We don't assume that dicts passed to PyDict are necessarily dicts, since there are a couple places
-// that we provide dict-like objects instead of proper dicts.
-// The performance should hopefully be comparable to the CPython fast case, since we can use
-// runtimeICs.
-extern "C" int PyDict_SetItem(PyObject* mp, PyObject* _key, PyObject* _item) noexcept {
-    ASSERT(PyDict_Check(mp) || mp->cls == attrwrapper_cls, "%s", getTypeName(mp));
-
-    assert(mp);
-    Box* b = static_cast<Box*>(mp);
-    Box* key = static_cast<Box*>(_key);
-    Box* item = static_cast<Box*>(_item);
-
-    assert(key);
-    assert(item);
-
-    try {
-        setitem(b, key, item);
-    } catch (ExcInfo e) {
-        setCAPIException(e);
-        return -1;
-    }
-    return 0;
-}
-
 extern "C" int PyDict_SetItemString(PyObject* mp, const char* key, PyObject* item) noexcept {
     Box* key_s;
     try {
@@ -383,6 +359,33 @@ Box* dictSetitem(BoxedDict* self, Box* k, Box* v) {
     return None;
 }
 
+// We don't assume that dicts passed to PyDict are necessarily dicts, since there are a couple places
+// that we provide dict-like objects instead of proper dicts.
+// The performance should hopefully be comparable to the CPython fast case, since we can use
+// runtimeICs.
+extern "C" int PyDict_SetItem(PyObject* mp, PyObject* _key, PyObject* _item) noexcept {
+    ASSERT(PyDict_Check(mp) || mp->cls == attrwrapper_cls, "%s", getTypeName(mp));
+
+    assert(mp);
+    Box* b = static_cast<Box*>(mp);
+    Box* key = static_cast<Box*>(_key);
+    Box* item = static_cast<Box*>(_item);
+
+    assert(key);
+    assert(item);
+
+    try {
+        if (PyDict_Check(mp))
+            dictSetitem((BoxedDict*)b, key, item);
+        else
+            setitem(b, key, item);
+    } catch (ExcInfo e) {
+        setCAPIException(e);
+        return -1;
+    }
+    return 0;
+}
+
 Box* dictDelitem(BoxedDict* self, Box* k) {
     if (!PyDict_Check(self))
         raiseExcHelper(TypeError, "descriptor '__delitem__' requires a 'dict' object but received a '%s'",

src/runtime/list.cpp

@@ -1244,11 +1244,8 @@ extern "C" int PyList_SetSlice(PyObject* a, Py_ssize_t ilow, Py_ssize_t ihigh, P
     ASSERT(PyList_Check(l), "%s", l->cls->tp_name);
 
     try {
-        BoxedSlice* slice = (BoxedSlice*)createSlice(boxInt(ilow), boxInt(ihigh), None);
-        if (v)
-            listSetitemSlice(l, slice, v);
-        else
-            listDelitemSlice(l, slice);
+        adjustNegativeIndicesOnObject(l, &ilow, &ihigh);
+        listSetitemSliceInt64(l, ilow, ihigh, 1, v);
         return 0;
     } catch (ExcInfo e) {
         setCAPIException(e);