moved DictGetItem utility code into ObjectHandling.c

Cython/Compiler/ExprNodes.py

@@ -2916,7 +2916,8 @@ class IndexNode(ExprNode):
                     index_code = self.index.py_result()
                     if self.base.type is dict_type:
                         function = "__Pyx_PyDict_GetItem"
-                        code.globalstate.use_utility_code(getitem_dict_utility_code)
+                        code.globalstate.use_utility_code(
+                            UtilityCode.load_cached("DictGetItem", "ObjectHandling.c"))
                     else:
                         function = "PyObject_GetItem"
                 code.putln(
@@ -9741,32 +9742,6 @@ requires = [raise_unbound_local_error_utility_code])
 
 #------------------------------------------------------------------------------------
 
-getitem_dict_utility_code = UtilityCode(
-proto = """
-#if PY_MAJOR_VERSION >= 3
-static PyObject *__Pyx_PyDict_GetItem(PyObject *d, PyObject* key) {
-    PyObject *value;
-    if (unlikely(d == Py_None)) {
-        __Pyx_RaiseNoneIndexingError();
-        return NULL;
-    }
-    value = PyDict_GetItemWithError(d, key);
-    if (unlikely(!value)) {
-        if (!PyErr_Occurred())
-            PyErr_SetObject(PyExc_KeyError, key);
-        return NULL;
-    }
-    Py_INCREF(value);
-    return value;
-}
-#else
-    #define __Pyx_PyDict_GetItem(d, key) PyObject_GetItem(d, key)
-#endif
-""",
-requires = [raise_noneindex_error_utility_code])
-
-#------------------------------------------------------------------------------------
-
 getitem_int_pyunicode_utility_code = UtilityCode(
 proto = '''
 #define __Pyx_GetItemInt_Unicode(o, i, size, to_py_func) (((size) <= sizeof(Py_ssize_t)) ? \\

Cython/Utility/ObjectHandling.c

@@ -235,6 +235,29 @@ static CYTHON_INLINE int __Pyx_IterFinish(void) {
 #endif
 }
 
+/////////////// DictGetItem.proto ///////////////
+//@requires: RaiseNoneIndexingError
+
+#if PY_MAJOR_VERSION >= 3
+static PyObject *__Pyx_PyDict_GetItem(PyObject *d, PyObject* key) {
+    PyObject *value;
+    if (unlikely(d == Py_None)) {
+        __Pyx_RaiseNoneIndexingError();
+        return NULL;
+    }
+    value = PyDict_GetItemWithError(d, key);
+    if (unlikely(!value)) {
+        if (!PyErr_Occurred())
+            PyErr_SetObject(PyExc_KeyError, key);
+        return NULL;
+    }
+    Py_INCREF(value);
+    return value;
+}
+#else
+    #define __Pyx_PyDict_GetItem(d, key) PyObject_GetItem(d, key)
+#endif
+
 /////////////// FindPy2Metaclass.proto ///////////////
 
 static PyObject *__Pyx_FindPy2Metaclass(PyObject *bases); /*proto*/