Skip to content

GH-96636: Remove all uses of NOTRACE_DISPATCH #96643

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
markshannon merged 10 commits into from
Sep 8, 2022
Merged

GH-96636: Remove all uses of NOTRACE_DISPATCH #96643

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
365b6cc
Remove potentially unsafe uses of NOTRACE_DISPATCH.
markshannon Sep 7, 2022
7785d40
Add test to check that tracing is respected in specialized code. Than…
markshannon Sep 7, 2022
85e5844
Add news.
markshannon Sep 7, 2022
3dd9966
Turn tracing off again after check.
markshannon Sep 7, 2022
5cfaab6
Remove all remaining uses of NOTRACE_DISPATCH() as they might be unsafe.
markshannon Sep 7, 2022
5872b7a
Update Lib/test/test_dynamic.py
markshannon Sep 7, 2022
7ff1782
Update Misc/NEWS.d/next/Core and Builtins/2022-09-07-12-02-11.gh-issu…
markshannon Sep 7, 2022
ff834d6
Update Lib/test/test_dynamic.py
markshannon Sep 7, 2022
72540d4
Fixup spacing
markshannon Sep 8, 2022
011edc7
Make sure that we don't double-trace instructions with extended args.
markshannon Sep 8, 2022
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
Prev Previous commit
Next Next commit
Remove all remaining uses of NOTRACE_DISPATCH() as they might be unsafe.
  • Loading branch information
@markshannon
markshannon committed Sep 7, 2022
commit 5cfaab684ed65696787563a2f128af0a2dd8bd58
12 changes: 3 additions & 9 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,12 +699,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
#define PRE_DISPATCH_GOTO() ((void)0)
#endif

#define NOTRACE_DISPATCH() \
{ \
NEXTOPARG(); \
PRE_DISPATCH_GOTO(); \
DISPATCH_GOTO(); \
}
Comment thread
gvanrossum marked this conversation as resolved.

/* Do interpreter dispatch accounting for tracing and instrumentation */
#define DISPATCH() \
Expand Down Expand Up @@ -1213,7 +1207,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
assert(value != NULL);
Py_INCREF(value);
PUSH(value);
NOTRACE_DISPATCH();
DISPATCH();
}

TARGET(LOAD_FAST__LOAD_CONST) {
Expand All @@ -1226,7 +1220,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
value = GETITEM(consts, oparg);
Py_INCREF(value);
PUSH(value);
NOTRACE_DISPATCH();
DISPATCH();
}

TARGET(STORE_FAST__LOAD_FAST) {
Expand Down Expand Up @@ -1261,7 +1255,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
assert(value != NULL);
Py_INCREF(value);
PUSH(value);
NOTRACE_DISPATCH();
DISPATCH();
}

TARGET(POP_TOP) {
Expand Down