[Python-checkins] cpython: revert #16672 for incorrect semantics

Wed Jan 23 14:38:56 CET 2013

http://hg.python.org/cpython/rev/cd87afe18ff8
changeset: 81677:cd87afe18ff8
user: Benjamin Peterson <benjamin at python.org>
date: Wed Jan 23 08:38:47 2013 -0500
summary:
 revert #16672 for incorrect semantics
files:
 Misc/NEWS | 2 --
 Python/ceval.c | 7 +++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 --git a/Python/ceval.c b/Python/ceval.c
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -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,
-- 
Repository URL: http://hg.python.org/cpython
