gh-98894: fix rebased DTrace follow-ups

pablogsal · pablogsal · commit 34aa59bd3320 · 2026-03-20T02:02:50.000Z
diff --git a/Lib/test/test_dtrace.py b/Lib/test/test_dtrace.py
@@ -101,7 +101,9 @@ def assert_usable(self):
 
 class DTraceBackend(TraceBackend):
     EXTENSION = ".d"
-    COMMAND = ["dtrace", "-q", "-Z", "-s"]
+    COMMAND = ["dtrace", "-q", "-s"]
+    if sys.platform == "sunos5":
+        COMMAND.insert(2, "-Z")
 
 
 class SystemTapBackend(TraceBackend):
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -1212,10 +1212,6 @@ dtrace_function_return(_PyInterpreterFrame *frame)
 }
 #endif
 
-typedef struct {
-    _PyInterpreterFrame frame;
-    _PyStackRef stack[1];
-} _PyEntryFrame;
 PyObject* _Py_HOT_FUNCTION DONT_SLP_VECTORIZE
 _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int throwflag)
 {

Original file line number	Diff line number	Diff line change
`@@ -1212,10 +1212,6 @@ dtrace_function_return(_PyInterpreterFrame *frame)`
`1212`	`1212`	`}`
`1213`	`1213`	`#endif`
`1214`	`1214`
`1215`		`-typedef struct {`
`1216`		`- _PyInterpreterFrame frame;`
`1217`		`- _PyStackRef stack[1];`
`1218`		`-} _PyEntryFrame;`
`1219`	`1215`	`PyObject* _Py_HOT_FUNCTION DONT_SLP_VECTORIZE`
`1220`	`1216`	`_PyEval_EvalFrameDefault(PyThreadState tstate, _PyInterpreterFrame frame, int throwflag)`
`1221`	`1217`	`{`