bpo-29941: Assert fixes

Include/unicodeobject.h

@@ -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

Objects/abstract.c

@@ -146,7 +146,9 @@ PyObject_GetItem(PyObject *o, PyObject *key)
  m = o->ob_type->tp_as_mapping;
  if (m && m->mp_subscript) {
  PyObject *item = m->mp_subscript(o, key);
+#ifdef Py_DEBUG
  assert((item != NULL) ^ (PyErr_Occurred() != NULL));
+#endif
  return item;
  }
 
@@ -1623,7 +1625,9 @@ PySequence_GetItem(PyObject *s, Py_ssize_t i)
  if (m->sq_length) {
  Py_ssize_t l = (*m->sq_length)(s);
  if (l < 0) {
+#ifdef Py_DEBUG
  assert(PyErr_Occurred());
+#endif
  return NULL;
  }
  i += l;

Objects/call.c

@@ -83,10 +83,12 @@ PyObject *
 _PyObject_FastCallDict(PyObject *callable, PyObject **args, Py_ssize_t nargs,
  PyObject *kwargs)
 {
+#ifdef Py_DEBUG
  /* _PyObject_FastCallDict() must not be called with an exception set,
  because it can clear it (directly or indirectly) and so the
  caller loses its exception */
  assert(!PyErr_Occurred());
+#endif
 
  assert(callable != NULL);
  assert(nargs >= 0);
@@ -136,10 +138,12 @@ PyObject *
 _PyObject_FastCallKeywords(PyObject *callable, PyObject **stack, Py_ssize_t nargs,
  PyObject *kwnames)
 {
+#ifdef Py_DEBUG
  /* _PyObject_FastCallKeywords() must not be called with an exception set,
  because it can clear it (directly or indirectly) and so the
  caller loses its exception */
  assert(!PyErr_Occurred());
+#endif
 
  assert(nargs >= 0);
  assert(kwnames == NULL || PyTuple_CheckExact(kwnames));
@@ -214,10 +218,13 @@ PyObject_Call(PyObject *callable, PyObject *args, PyObject *kwargs)
  ternaryfunc call;
  PyObject *result;
 
+#ifdef Py_DEBUG
  /* PyObject_Call() must not be called with an exception set,
  because it can clear it (directly or indirectly) and so the
  caller loses its exception */
  assert(!PyErr_Occurred());
+#endif
+
  assert(PyTuple_Check(args));
  assert(kwargs == NULL || PyDict_Check(kwargs));
 
@@ -445,10 +452,12 @@ PyObject *
 _PyMethodDef_RawFastCallDict(PyMethodDef *method, PyObject *self, PyObject **args,
  Py_ssize_t nargs, PyObject *kwargs)
 {
+#ifdef Py_DEBUG
  /* _PyMethodDef_RawFastCallDict() must not be called with an exception set,
  because it can clear it (directly or indirectly) and so the
  caller loses its exception */
  assert(!PyErr_Occurred());
+#endif
 
  assert(method != NULL);
  assert(nargs >= 0);
@@ -579,10 +588,12 @@ PyObject *
 _PyMethodDef_RawFastCallKeywords(PyMethodDef *method, PyObject *self, PyObject **args,
  Py_ssize_t nargs, PyObject *kwnames)
 {
+#ifdef Py_DEBUG
  /* _PyMethodDef_RawFastCallKeywords() must not be called with an exception set,
  because it can clear it (directly or indirectly) and so the
  caller loses its exception */
  assert(!PyErr_Occurred());
+#endif
 
  assert(method != NULL);
  assert(nargs >= 0);
@@ -716,7 +727,9 @@ _PyCFunction_FastCallKeywords(PyObject *func, PyObject **args,
 static PyObject *
 cfunction_call_varargs(PyObject *func, PyObject *args, PyObject *kwargs)
 {
+#ifdef Py_DEBUG
  assert(!PyErr_Occurred());
+#endif
 
  PyCFunction meth = PyCFunction_GET_FUNCTION(func);
  PyObject *self = PyCFunction_GET_SELF(func);

Objects/dictobject.c

@@ -437,7 +437,7 @@ static PyObject *empty_values[1] = { NULL };
 /* #define DEBUG_PYDICT */
 
 
-#ifdef Py_DEBUG
+#ifndef NDEBUG
 static int
 _PyDict_CheckConsistency(PyDictObject *mp)
 {

Objects/obmalloc.c

@@ -1227,7 +1227,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

Objects/typeobject.c

@@ -128,7 +128,7 @@ skip_signature(const char *doc)
  return NULL;
 }
 
-#ifdef Py_DEBUG
+#ifndef NDEBUG
 static int
 _PyType_CheckConsistency(PyTypeObject *type)
 {