gh-99845: Clean up _PyObject_VAR_SIZE() usage #99847
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
vstinner
commented
Nov 28, 2022
•
- code_sizeof() now uses unsigned type to compute the result.
- Fix _PyObject_ComputedDictPointer(): cast _PyObject_VAR_SIZE() to Py_ssize_t, rather than long.
- Clarify that _PyObject_VAR_SIZE() uses an unsigned type (size_t).
- Issue: PEP 670: Convert _PyObject_SIZE() and _PyObject_VAR_SIZE() macros to functions #99845
* code_sizeof() now uses unsigned type to compute the result. * Fix _PyObject_ComputedDictPointer(): cast _PyObject_VAR_SIZE() to Py_ssize_t, rather than long. * Clarify that _PyObject_VAR_SIZE() uses an unsigned type (size_t).
serhiy-storchaka
reviewed
Nov 30, 2022
| Py_ssize_t tsize = Py_SIZE(obj); | ||
| if (tsize < 0) { | ||
| tsize = -tsize; | ||
| } | ||
| size_t size = _PyObject_VAR_SIZE(tp, tsize); | ||
| assert(size <= (size_t)PY_SSIZE_T_MAX); | ||
| dictoffset += (Py_ssize_t)size; |
There was a problem hiding this comment.
It should be backported.
|
The dictoffset code was different in 2001 when the cast was added: commit 6d483d3 Change: - dictoffset += size;
+ dictoffset += (long)size;Code: PyObject **
_PyObject_GetDictPtr(PyObject *obj)
{
long dictoffset;
...
if (dictoffset < 0) {
size_t size;
_PyObject_VAR_SIZE(size, tp, ((PyVarObject *)obj)->ob_size);
dictoffset += (long)size;
assert(dictoffset > 0);
assert(dictoffset % SIZEOF_VOID_P == 0);
}
...
}The dictoffset type was changed in 2006 by commit 725507b without updating the cast, forgotten in the enhancement. My change, replace |
|
I created PR #99922 to backport the cast fix to Python 3.11 (and 3.10). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.