Commit 2261c17e authored by Stefan Behnel's avatar Stefan Behnel

Avoid tuple argument packing if possible when raising a KeyError on unsuccessful dict lookups.

Reducing the overhead here is actually helpful since many KeyErrors will never be instantiated.
parent a88dd24d
......@@ -338,10 +338,17 @@ static PyObject *__Pyx_PyDict_GetItem(PyObject *d, PyObject* key) {
value = PyDict_GetItemWithError(d, key);
if (unlikely(!value)) {
if (!PyErr_Occurred()) {
if (unlikely(PyTuple_Check(key))) {
// CPython interprets tuples as separate arguments => must wrap them in another tuple.
PyObject* args = PyTuple_Pack(1, key);
if (likely(args))
if (likely(args)) {
PyErr_SetObject(PyExc_KeyError, args);
Py_XDECREF(args);
Py_DECREF(args);
}
} else {
// Avoid tuple packing if possible.
PyErr_SetObject(PyExc_KeyError, key);
}
}
return NULL;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment