diff --git a/mypyc/lib-rt/bytes_ops.c b/mypyc/lib-rt/bytes_ops.c index 5ddf3528211f..6ff34b021a9a 100644 --- a/mypyc/lib-rt/bytes_ops.c +++ b/mypyc/lib-rt/bytes_ops.c @@ -102,7 +102,11 @@ PyObject *CPyBytes_Join(PyObject *sep, PyObject *iter) { return PyBytes_Join(sep, iter); } else { _Py_IDENTIFIER(join); - return _PyObject_CallMethodIdOneArg(sep, &PyId_join, iter); + PyObject *name = _PyUnicode_FromId(&PyId_join); /* borrowed */ + if (name == NULL) { + return NULL; + } + return PyObject_CallMethodOneArg(sep, name, iter); } } diff --git a/mypyc/lib-rt/dict_ops.c b/mypyc/lib-rt/dict_ops.c index b33233521afd..b102aba57307 100644 --- a/mypyc/lib-rt/dict_ops.c +++ b/mypyc/lib-rt/dict_ops.c @@ -208,7 +208,11 @@ PyObject *CPyDict_KeysView(PyObject *dict) { return _CPyDictView_New(dict, &PyDictKeys_Type); } _Py_IDENTIFIER(keys); - return _PyObject_CallMethodIdNoArgs(dict, &PyId_keys); + PyObject *name = _PyUnicode_FromId(&PyId_keys); /* borrowed */ + if (name == NULL) { + return NULL; + } + return PyObject_CallMethodNoArgs(dict, name); } PyObject *CPyDict_ValuesView(PyObject *dict) { @@ -216,7 +220,11 @@ PyObject *CPyDict_ValuesView(PyObject *dict) { return _CPyDictView_New(dict, &PyDictValues_Type); } _Py_IDENTIFIER(values); - return _PyObject_CallMethodIdNoArgs(dict, &PyId_values); + PyObject *name = _PyUnicode_FromId(&PyId_values); /* borrowed */ + if (name == NULL) { + return NULL; + } + return PyObject_CallMethodNoArgs(dict, name); } PyObject *CPyDict_ItemsView(PyObject *dict) { @@ -224,7 +232,11 @@ PyObject *CPyDict_ItemsView(PyObject *dict) { return _CPyDictView_New(dict, &PyDictItems_Type); } _Py_IDENTIFIER(items); - return _PyObject_CallMethodIdNoArgs(dict, &PyId_items); + PyObject *name = _PyUnicode_FromId(&PyId_items); /* borrowed */ + if (name == NULL) { + return NULL; + } + return PyObject_CallMethodNoArgs(dict, name); } PyObject *CPyDict_Keys(PyObject *dict) { @@ -234,7 +246,11 @@ PyObject *CPyDict_Keys(PyObject *dict) { // Inline generic fallback logic to also return a list. PyObject *list = PyList_New(0); _Py_IDENTIFIER(keys); - PyObject *view = _PyObject_CallMethodIdNoArgs(dict, &PyId_keys); + PyObject *name = _PyUnicode_FromId(&PyId_keys); /* borrowed */ + if (name == NULL) { + return NULL; + } + PyObject *view = PyObject_CallMethodNoArgs(dict, name); if (view == NULL) { return NULL; } @@ -253,7 +269,11 @@ PyObject *CPyDict_Values(PyObject *dict) { // Inline generic fallback logic to also return a list. PyObject *list = PyList_New(0); _Py_IDENTIFIER(values); - PyObject *view = _PyObject_CallMethodIdNoArgs(dict, &PyId_values); + PyObject *name = _PyUnicode_FromId(&PyId_values); /* borrowed */ + if (name == NULL) { + return NULL; + } + PyObject *view = PyObject_CallMethodNoArgs(dict, name); if (view == NULL) { return NULL; } @@ -272,7 +292,11 @@ PyObject *CPyDict_Items(PyObject *dict) { // Inline generic fallback logic to also return a list. PyObject *list = PyList_New(0); _Py_IDENTIFIER(items); - PyObject *view = _PyObject_CallMethodIdNoArgs(dict, &PyId_items); + PyObject *name = _PyUnicode_FromId(&PyId_items); /* borrowed */ + if (name == NULL) { + return NULL; + } + PyObject *view = PyObject_CallMethodNoArgs(dict, name); if (view == NULL) { return NULL; } @@ -289,7 +313,11 @@ char CPyDict_Clear(PyObject *dict) { PyDict_Clear(dict); } else { _Py_IDENTIFIER(clear); - PyObject *res = _PyObject_CallMethodIdNoArgs(dict, &PyId_clear); + PyObject *name = _PyUnicode_FromId(&PyId_clear); /* borrowed */ + if (name == NULL) { + return 0; + } + PyObject *res = PyObject_CallMethodNoArgs(dict, name); if (res == NULL) { return 0; } @@ -302,7 +330,11 @@ PyObject *CPyDict_Copy(PyObject *dict) { return PyDict_Copy(dict); } _Py_IDENTIFIER(copy); - return _PyObject_CallMethodIdNoArgs(dict, &PyId_copy); + PyObject *name = _PyUnicode_FromId(&PyId_copy); /* borrowed */ + if (name == NULL) { + return NULL; + } + return PyObject_CallMethodNoArgs(dict, name); } PyObject *CPyDict_GetKeysIter(PyObject *dict) { @@ -321,7 +353,11 @@ PyObject *CPyDict_GetItemsIter(PyObject *dict) { return dict; } _Py_IDENTIFIER(items); - PyObject *view = _PyObject_CallMethodIdNoArgs(dict, &PyId_items); + PyObject *name = _PyUnicode_FromId(&PyId_items); /* borrowed */ + if (name == NULL) { + return NULL; + } + PyObject *view = PyObject_CallMethodNoArgs(dict, name); if (view == NULL) { return NULL; } @@ -337,7 +373,11 @@ PyObject *CPyDict_GetValuesIter(PyObject *dict) { return dict; } _Py_IDENTIFIER(values); - PyObject *view = _PyObject_CallMethodIdNoArgs(dict, &PyId_values); + PyObject *name = _PyUnicode_FromId(&PyId_values); /* borrowed */ + if (name == NULL) { + return NULL; + } + PyObject *view = PyObject_CallMethodNoArgs(dict, name); if (view == NULL) { return NULL; } diff --git a/mypyc/lib-rt/misc_ops.c b/mypyc/lib-rt/misc_ops.c index a674240d8940..d234138b2ff7 100644 --- a/mypyc/lib-rt/misc_ops.c +++ b/mypyc/lib-rt/misc_ops.c @@ -24,11 +24,15 @@ PyObject *CPyIter_Send(PyObject *iter, PyObject *val) { // Do a send, or a next if second arg is None. // (This behavior is to match the PEP 380 spec for yield from.) - _Py_IDENTIFIER(send); if (Py_IsNone(val)) { return CPyIter_Next(iter); } else { - return _PyObject_CallMethodIdOneArg(iter, &PyId_send, val); + _Py_IDENTIFIER(send); + PyObject *name = _PyUnicode_FromId(&PyId_send); /* borrowed */ + if (name == NULL) { + return NULL; + } + return PyObject_CallMethodOneArg(iter, name, val); } } diff --git a/mypyc/lib-rt/pythonsupport.h b/mypyc/lib-rt/pythonsupport.h index f35f8a1a6e4e..7019c12cf59a 100644 --- a/mypyc/lib-rt/pythonsupport.h +++ b/mypyc/lib-rt/pythonsupport.h @@ -17,7 +17,6 @@ #ifndef Py_BUILD_CORE #define Py_BUILD_CORE #endif -#include "internal/pycore_call.h" // _PyObject_CallMethodIdNoArgs, _PyObject_CallMethodIdOneArg #include "internal/pycore_genobject.h" // _PyGen_FetchStopIterationValue #include "internal/pycore_pyerrors.h" // _PyErr_FormatFromCause, _PyErr_SetKeyError #include "internal/pycore_setobject.h" // _PySet_Update