Skip to content

Commit ec0f241

Browse files
committed
pythongh-98894: fix rebased DTrace follow-ups
1 parent f8b0571 commit ec0f241

5 files changed

Lines changed: 14 additions & 6 deletions

File tree

Lib/test/test_dtrace.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ def assert_usable(self):
101101

102102
class DTraceBackend(TraceBackend):
103103
EXTENSION = ".d"
104-
COMMAND = ["dtrace", "-q", "-Z", "-s"]
104+
COMMAND = ["dtrace", "-q", "-s"]
105+
if sys.platform == "sunos5":
106+
COMMAND.insert(2, "-Z")
105107

106108

107109
class SystemTapBackend(TraceBackend):

Modules/_testinternalcapi/test_cases.c.h

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Modules/_testinternalcapi/test_targets.h

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Python/ceval.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,10 +1206,6 @@ dtrace_function_return(_PyInterpreterFrame *frame)
12061206
}
12071207
#endif
12081208

1209-
typedef struct {
1210-
_PyInterpreterFrame frame;
1211-
_PyStackRef stack[1];
1212-
} _PyEntryFrame;
12131209
PyObject* _Py_HOT_FUNCTION DONT_SLP_VECTORIZE
12141210
_PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int throwflag)
12151211
{

Python/generated_cases.c.h

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)