Skip to content

bpo-41670: Remove outdated predict macro invocation. #22026

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 6 commits into from
Sep 29, 2020
Merged

bpo-41670: Remove outdated predict macro invocation. #22026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a6e489d
Remove PREDICTion of POP_BLOCK from FOR_ITER. Partial fix for https:/…
markshannon Aug 31, 2020
d95771f
Add test for https://bugs.python.org/issue41670.
markshannon Aug 31, 2020
0c8177d
Add news
markshannon Aug 31, 2020
8e99b21
Remove unused PREDICTED macro invocation.
markshannon Aug 31, 2020
b041795
Fix typo
markshannon Aug 31, 2020
2dbee99
Clarify change note.
markshannon Sep 25, 2020
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
17 changes: 17 additions & 0 deletions Lib/test/test_sys_settrace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,23 @@ def run(tracer):
self.compare_events(doit_async.__code__.co_firstlineno,
tracer.events, events)

def test_loop_in_try_except(self):
# https://bugs.python.org/issue41670

def func():
try:
for i in []: pass
return 1
except:
return 2

self.run_and_compare(func,
[(0, 'call'),
(1, 'line'),
(2, 'line'),
(3, 'line'),
(3, 'return')])


class SkipLineEventsTraceTestCase(TraceTestCase):
"""Repeat the trace tests, but with per-line events skipped"""
Expand Down
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2020-08-31-11-37-59.bpo-41670.vmRJRx.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Prevent line trace being skipped on platforms not compiled
with ``USE_COMPUTED_GOTOS``.
Fixes issue where some lines nested within a try-except block
were not being traced on Windows.
2 changes: 0 additions & 2 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2297,7 +2297,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
}

case TARGET(POP_BLOCK): {
PREDICTED(POP_BLOCK);
PyFrame_BlockPop(f);
DISPATCH();
}
Expand Down Expand Up @@ -3352,7 +3351,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
STACK_SHRINK(1);
Py_DECREF(iter);
JUMPBY(oparg);
PREDICT(POP_BLOCK);
DISPATCH();
}

Expand Down