8000 bpo-29941: Assert fixes by Yhg1s · Pull Request #886 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-29941: Assert fixes #886

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
merged 4 commits into from
Mar 31, 2017
Merged

bpo-29941: Assert fixes #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d51e41
Make a non-Py_DEBUG, asserts-enabled build of CPython possible. This …
Yhg1s Mar 29, 2017
7333298
Only check for PyErr_Occurred() in asserts when in a Py_DEBUG build. …
Yhg1s Mar 29, 2017
b61d7cb
Revert "Only check for PyErr_Occurred() in asserts when in a Py_DEBUG…
Yhg1s Mar 30, 2017
a8be9b8
Move around some of the code.
Yhg1s Mar 30, 2017
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
4 changes: 4 additions & 0 deletions Include/unicodeobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2313,6 +2313,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

#ifndef Py_LIMITED_API
Expand Down
2 changes: 1 addition & 1 deletion Objects/dictobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ static PyObject *empty_values[1] = { NULL };
/* #define DEBUG_PYDICT */


#ifdef Py_DEBUG
#ifndef NDEBUG
static int
_PyDict_CheckConsistency(PyDictObject *mp)
{
Expand Down
6 changes: 3 additions & 3 deletions Objects/obmalloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,6 +1227,9 @@ _PyObject_Alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize)

_Py_AllocatedBlocks++;

if (nelem == 0 || elsize == 0)
goto redirect;

assert(nelem <= PY_SSIZE_T_MAX / elsize);
nbytes = nelem * elsize;

Expand All @@ -1237,9 +1240,6 @@ _PyObject_Alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize)
goto redirect;
#endif

if (nelem == 0 || elsize == 0)
goto redirect;

if ((nbytes - 1) < SMALL_REQUEST_THRESHOLD) {
LOCK();
/*
Expand Down
2 changes: 1 addition & 1 deletion Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ skip_signature(const char *doc)
return NULL;
}

#ifdef Py_DEBUG
#ifndef NDEBUG
static int
_PyType_CheckConsistency(PyTypeObject *type)
{
Expand Down
0