(original) (raw)

changeset: 81677:cd87afe18ff8 user: Benjamin Peterson benjamin@python.org date: Wed Jan 23 08:38:47 2013 -0500 files: Misc/NEWS Python/ceval.c description: revert #16672 for incorrect semantics diff -r 3d7000549eb1 -r cd87afe18ff8 Misc/NEWS --- a/Misc/NEWS Wed Jan 23 03:01:23 2013 -0800 +++ b/Misc/NEWS Wed Jan 23 08:38:47 2013 -0500 @@ -50,8 +50,6 @@ - Issue #15422: Get rid of PyCFunction_New macro. Use PyCFunction_NewEx function (PyCFunction_New func is still present for backward compatibility). -- Issue #16672: Improve performance tracing performance - - Issue #14470: Remove w9xpopen support per PEP 11. - Issue #9856: Replace deprecation warning with raising TypeError diff -r 3d7000549eb1 -r cd87afe18ff8 Python/ceval.c --- a/Python/ceval.c Wed Jan 23 03:01:23 2013 -0800 +++ b/Python/ceval.c Wed Jan 23 08:38:47 2013 -0500 @@ -1277,8 +1277,7 @@ /* line-by-line tracing support */ if (_Py_TracingPossible && - tstate->c_tracefunc != NULL && !tstate->tracing && - f->f_trace != NULL) { + tstate->c_tracefunc != NULL && !tstate->tracing) { int err; /* see maybe_call_line_trace for expository comments */ @@ -3009,7 +3008,7 @@ /* Log traceback info. */ PyTraceBack_Here(f); - if (tstate->c_tracefunc != NULL && f->f_trace != NULL) + if (tstate->c_tracefunc != NULL) call_exc_trace(tstate->c_tracefunc, tstate->c_traceobj, f); fast_block_end: @@ -3128,7 +3127,7 @@ } if (tstate->use_tracing) { - if (tstate->c_tracefunc && f->f_trace != NULL) { + if (tstate->c_tracefunc) { if (why == WHY_RETURN || why == WHY_YIELD) { if (call_trace(tstate->c_tracefunc, tstate->c_traceobj, f, /benjamin@python.org