mirror of
https://github.com/python/cpython.git
synced 2025-10-08 16:11:51 +00:00
Make a non-Py_DEBUG, asserts-enabled build of CPython possible. This means making sure helper functions are defined when NDEBUG is not defined, not just when Py_DEBUG is defined. Also fix a division-by-zero in obmalloc.c that went unnoticed because in Py_DEBUG mode, elsize is never zero. (cherry picked from commita00c3fd12d
and06bb4873d6
)
This commit is contained in:
parent
51fc7e3d6a
commit
553275d125
2 changed files with 7 additions and 1 deletions
|
@ -2263,6 +2263,10 @@ PyAPI_FUNC(Py_UNICODE*) PyUnicode_AsUnicodeCopy(
|
||||||
PyAPI_FUNC(int) _PyUnicode_CheckConsistency(
|
PyAPI_FUNC(int) _PyUnicode_CheckConsistency(
|
||||||
PyObject *op,
|
PyObject *op,
|
||||||
int check_content);
|
int check_content);
|
||||||
|
#elif !defined(NDEBUG)
|
||||||
|
/* For asserts that call _PyUnicode_CheckConsistency(), which would
|
||||||
|
* otherwise be a problem when building with asserts but without Py_DEBUG. */
|
||||||
|
#define _PyUnicode_CheckConsistency(op, check_content) PyUnicode_Check(op)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Return an interned Unicode object for an Identifier; may fail if there is no memory.*/
|
/* Return an interned Unicode object for an Identifier; may fail if there is no memory.*/
|
||||||
|
|
|
@ -1176,7 +1176,7 @@ _PyObject_Alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize)
|
||||||
|
|
||||||
_Py_AllocatedBlocks++;
|
_Py_AllocatedBlocks++;
|
||||||
|
|
||||||
assert(nelem <= PY_SSIZE_T_MAX / elsize);
|
assert(elsize == 0 || nelem <= PY_SSIZE_T_MAX / elsize);
|
||||||
nbytes = nelem * elsize;
|
nbytes = nelem * elsize;
|
||||||
|
|
||||||
#ifdef WITH_VALGRIND
|
#ifdef WITH_VALGRIND
|
||||||
|
@ -2233,7 +2233,9 @@ _PyObject_DebugMallocStats(FILE *out)
|
||||||
|
|
||||||
if (p->ref.count == 0) {
|
if (p->ref.count == 0) {
|
||||||
/* currently unused */
|
/* currently unused */
|
||||||
|
#ifdef Py_DEBUG
|
||||||
assert(pool_is_in_list(p, arenas[i].freepools));
|
assert(pool_is_in_list(p, arenas[i].freepools));
|
||||||
|
#endif
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
++numpools[sz];
|
++numpools[sz];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue