cpython: 92a9ccb2a521 (original) (raw)

Mercurial > cpython

changeset 84648:92a9ccb2a521

Issue #18408: add more assertions on PyErr_Occurred() in ceval.c to detect bugs earlier [#18408]

Victor Stinner victor.stinner@gmail.com
date	Tue, 16 Jul 2013 01:02:12 +0200
parents	2e42c0a39321
children	9213313b1a6f
files	Objects/abstract.c Python/ceval.c
diffstat	2 files changed, 5 insertions(+), 2 deletions(-)[+] [-] Objects/abstract.c 3 Python/ceval.c 4

line wrap: on

line diff

--- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2111,8 +2111,7 @@ PyObject_Call(PyObject *func, PyObject * "NULL result without error in PyObject_Call"); } #else

```
   if (result == NULL)[](#l1.7)
```

       assert(PyErr_Occurred());[](#l1.8)

   assert(result != NULL || PyErr_Occurred());[](#l1.9)

#endif return result; }

--- a/Python/ceval.c +++ b/Python/ceval.c @@ -4216,6 +4216,8 @@ call_function(PyObject ***pp_stack, int READ_TIMESTAMP(*pintr1); Py_DECREF(func); }

assert((x != NULL && !PyErr_Occurred())

      || (x == NULL && PyErr_Occurred()));[](#l2.8)

/* Clear the stack of the function object. Also removes the arguments in case they weren't consumed already @@ -4509,6 +4511,8 @@ ext_call_fail: Py_XDECREF(callargs); Py_XDECREF(kwdict); Py_XDECREF(stararg);

assert((result != NULL && !PyErr_Occurred())

      || (result == NULL && PyErr_Occurred()));[](#l2.17)

return result; }