Visitar URL original
gh-99845: Use size_t type in __sizeof__() methods by vstinner · Pull Request #99846 · python/cpython · GitHub
Skip to content

gh-99845: Use size_t type in __sizeof__() methods #99846

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

Merged
vstinner merged 2 commits into from
Nov 30, 2022
Merged

gh-99845: Use size_t type in __sizeof__() methods #99846

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de1ae48
gh-99845: Use size_t type in __sizeof__() methods
vstinner Nov 28, 2022
1710a7d
Fix compiler warnings in deque_sizeof()
vstinner Nov 28, 2022
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
Prev Previous commit
Fix compiler warnings in deque_sizeof()
  • Loading branch information
@vstinner
vstinner committed Nov 28, 2022
commit 1710a7d57c0061b5d53daa5db5289ce440a7365c
4 changes: 2 additions & 2 deletions Modules/_collectionsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1511,8 +1511,8 @@ deque_sizeof(dequeobject *deque, void *unused)
size_t res = _PyObject_SIZE(Py_TYPE(deque));

@serhiy-storchaka serhiy-storchaka Nov 30, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't it need an explicit cast to size_t?

@vstinner vstinner Dec 1, 2022

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I chose to limit this change only to prepare the code for _PyObject_SIZE() API change.

With commit 131801d, _PyObject_SIZE() return type is now well defined: it returns a size_t.

size_t blocks;
blocks = (size_t)(deque->leftindex + Py_SIZE(deque) + BLOCKLEN - 1) / BLOCKLEN;
assert(deque->leftindex + Py_SIZE(deque) - 1 ==
(blocks - 1) * BLOCKLEN + deque->rightindex);
assert(((size_t)deque->leftindex + (size_t)Py_SIZE(deque) - 1) ==
((blocks - 1) * BLOCKLEN + (size_t)deque->rightindex));
res += blocks * sizeof(block);
return PyLong_FromSize_t(res);
}
Expand Down