diff options
| author | T. Wouters <thomas@python.org> | 2017-04-02 03:20:24 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-02 03:20:24 (GMT) |
| commit | 553275d125478a6563dde7523f4f28c92f1861b4 (patch) | |
| tree | 1f2c8282fcf7a3cb821d281befbd2bb38fde971d | |
| parent | 51fc7e3d6a29de7b3142e51f8caf4d31f7ac72a0 (diff) | |
| download | cpython-553275d125478a6563dde7523f4f28c92f1861b4.zip cpython-553275d125478a6563dde7523f4f28c92f1861b4.tar.gz cpython-553275d125478a6563dde7523f4f28c92f1861b4.tar.bz2 | |
bpo-29941: Assert fixes (#886) (#956)
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 commit a00c3fd12d421e41b769debd7df717d17b0deed5 and 06bb4873d6a9ac303701d08a851d6cd9a51e02a3)
| -rw-r--r-- | Include/unicodeobject.h | 4 | ||||
| -rw-r--r-- | Objects/obmalloc.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index 0accc1d..59dcf73 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -2263,6 +2263,10 @@ PyAPI_FUNC(Py_UNICODE*) PyUnicode_AsUnicodeCopy( PyAPI_FUNC(int) _PyUnicode_CheckConsistency( PyObject *op, 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 /* Return an interned Unicode object for an Identifier; may fail if there is no memory.*/ diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c index 7cc889f..9dd8421 100644 --- a/Objects/obmalloc.c +++ b/Objects/obmalloc.c @@ -1176,7 +1176,7 @@ _PyObject_Alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize) _Py_AllocatedBlocks++; - assert(nelem <= PY_SSIZE_T_MAX / elsize); + assert(elsize == 0 || nelem <= PY_SSIZE_T_MAX / elsize); nbytes = nelem * elsize; #ifdef WITH_VALGRIND @@ -2233,7 +2233,9 @@ _PyObject_DebugMallocStats(FILE *out) if (p->ref.count == 0) { /* currently unused */ +#ifdef Py_DEBUG assert(pool_is_in_list(p, arenas[i].freepools)); +#endif continue; } ++numpools[sz]; |