Skip to content

gh-124153: Replace PyType_GetModuleByDef in defdict_or #124263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

gh-124153: Replace PyType_GetModuleByDef in defdict_or #124263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b88451
Replace `PyType_GetModuleByDef` in `defdict_or`
rruuaanng Sep 20, 2024
cd62db6
Delete space
rruuaanng Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Modules/_collectionsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
static inline collections_state *
find_module_state_by_def(PyTypeObject *type)
{
PyObject *mod = PyType_GetModuleByDef(type, &_collectionsmodule);
PyObject *mod = defdict_or(type, &_collectionsmodule);

Check failure on line 40 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test 

implicit declaration of function ‘defdict_or’ [-Werror=implicit-function-declaration]

Check warning on line 40 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test 

initialization of ‘PyObject *’ {aka ‘struct _object *’} from ‘int’ makes pointer from integer without a cast [-Wint-conversion]

Check failure on line 40 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

implicit declaration of function ‘defdict_or’ [-Werror=implicit-function-declaration]

Check warning on line 40 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

initialization of ‘PyObject *’ {aka ‘struct _object *’} from ‘int’ makes pointer from integer without a cast [-Wint-conversion]

Check failure on line 40 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Address sanitizer 

implicit declaration of function ‘defdict_or’ [-Werror=implicit-function-declaration]

Check warning on line 40 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Address sanitizer 

initialization of ‘PyObject *’ {aka ‘struct _object *’} from ‘int’ makes pointer from integer without a cast [-Wint-conversion]

Check warning on line 40 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build (arm64) 

'defdict_or' undefined; assuming extern returning int [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]

Check warning on line 40 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build (arm64) 

'initializing': 'PyObject *' differs in levels of indirection from 'int' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]

Check warning on line 40 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build and test (x64) 

'defdict_or' undefined; assuming extern returning int [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]

Check warning on line 40 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build and test (x64) 

'initializing': 'PyObject *' differs in levels of indirection from 'int' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]

Check warning on line 40 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / build (arm64) 

'defdict_or' undefined; assuming extern returning int [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]

Check warning on line 40 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / build (arm64) 

'initializing': 'PyObject *' differs in levels of indirection from 'int' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]
assert(mod != NULL);
return get_module_state(mod);
}
Expand Down Expand Up @@ -2354,17 +2354,17 @@
}

static PyObject*
defdict_or(PyObject* left, PyObject* right)

Check failure on line 2357 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test 

conflicting types for ‘defdict_or’; have ‘PyObject *(PyObject *, PyObject *)’ {aka ‘struct _object *(struct _object *, struct _object *)’}

Check failure on line 2357 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

conflicting types for ‘defdict_or’; have ‘PyObject *(PyObject *, PyObject *)’ {aka ‘struct _object *(struct _object *, struct _object *)’}

Check failure on line 2357 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Address sanitizer 

conflicting types for ‘defdict_or’

Check failure on line 2357 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build (arm64) 

'defdict_or': 'PyObject *(PyObject *,PyObject *)' differs in levels of indirection from 'int ()' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]

Check failure on line 2357 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build and test (x64) 

'defdict_or': 'PyObject *(PyObject *,PyObject *)' differs in levels of indirection from 'int ()' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]

Check failure on line 2357 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / build (arm64) 

'defdict_or': 'PyObject *(PyObject *,PyObject *)' differs in levels of indirection from 'int ()' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]
{
PyObject *self, *other;

// Find module state
PyTypeObject *tp = Py_TYPE(left);
PyObject *mod = PyType_GetModuleByDef(tp, &_collectionsmodule);
PyObject *mod = defdict_or(tp, &_collectionsmodule);

Check warning on line 2363 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test 

passing argument 1 of ‘defdict_or’ from incompatible pointer type [-Wincompatible-pointer-types]

Check warning on line 2363 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test 

passing argument 2 of ‘defdict_or’ from incompatible pointer type [-Wincompatible-pointer-types]

Check warning on line 2363 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

passing argument 1 of ‘defdict_or’ from incompatible pointer type [-Wincompatible-pointer-types]

Check warning on line 2363 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

passing argument 2 of ‘defdict_or’ from incompatible pointer type [-Wincompatible-pointer-types]

Check warning on line 2363 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Address sanitizer 

passing argument 1 of ‘defdict_or’ from incompatible pointer type [-Wincompatible-pointer-types]

Check warning on line 2363 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Address sanitizer 

passing argument 2 of ‘defdict_or’ from incompatible pointer type [-Wincompatible-pointer-types]

Check warning on line 2363 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build (arm64) 

'initializing': 'PyObject *' differs in levels of indirection from 'int' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]

Check warning on line 2363 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build and test (x64) 

'initializing': 'PyObject *' differs in levels of indirection from 'int' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]

Check warning on line 2363 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / build (arm64) 

'initializing': 'PyObject *' differs in levels of indirection from 'int' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]
if (mod == NULL) {
PyErr_Clear();
tp = Py_TYPE(right);
mod = PyType_GetModuleByDef(tp, &_collectionsmodule);
mod = defdict_or(tp, &_collectionsmodule);

Check warning on line 2367 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test 

passing argument 1 of ‘defdict_or’ from incompatible pointer type [-Wincompatible-pointer-types]

Check warning on line 2367 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test 

passing argument 2 of ‘defdict_or’ from incompatible pointer type [-Wincompatible-pointer-types]

Check warning on line 2367 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

passing argument 1 of ‘defdict_or’ from incompatible pointer type [-Wincompatible-pointer-types]

Check warning on line 2367 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

passing argument 2 of ‘defdict_or’ from incompatible pointer type [-Wincompatible-pointer-types]

Check warning on line 2367 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Address sanitizer 

passing argument 1 of ‘defdict_or’ from incompatible pointer type [-Wincompatible-pointer-types]

Check warning on line 2367 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Address sanitizer 

passing argument 2 of ‘defdict_or’ from incompatible pointer type [-Wincompatible-pointer-types]

Check warning on line 2367 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build (arm64) 

'=': 'PyObject *' differs in levels of indirection from 'int' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]

Check warning on line 2367 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build and test (x64) 

'=': 'PyObject *' differs in levels of indirection from 'int' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]

Check warning on line 2367 in Modules/_collectionsmodule.c

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / build (arm64) 

'=': 'PyObject *' differs in levels of indirection from 'int' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]
}
assert(mod != NULL);
collections_state *state = get_module_state(mod);
Expand Down
Loading