pythongh-98894: fix rebased DTrace follow-ups

Author: pablogsal

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):
@@ -149,6 +151,13 @@ class BPFTraceBackend(TraceBackend):
     # Which test scripts to filter by filename (None = use @tracing flag)
     FILTER_BY_FILENAME = {"call_stack": "call_stack.py"}
 
+    @staticmethod
+    def _filter_probe_rows(output):
+        return "\n".join(
+            line for line in output.splitlines()
+            if line.partition("\t")[0].isdigit()
+        )
+
     # Expected outputs for each test case
     # Note: bpftrace captures <module> entry/return and may have slight timing
     # differences compared to SystemTap due to probe firing order
@@ -214,6 +223,8 @@ def run_case(self, name, optimize_python=None):
                 f"bpftrace failed with code {proc.returncode}:\n{stderr}"
             )
 
+        stdout = self._filter_probe_rows(stdout)
+
         # Filter output by filename if specified (bpftrace captures everything)
         if name in self.FILTER_BY_FILENAME:
             filter_filename = self.FILTER_BY_FILENAME[name]
@@ -258,6 +269,19 @@ def assert_usable(self):
             )
 
 
+class BPFTraceOutputTests(unittest.TestCase):
+    def test_filter_probe_rows_ignores_warnings(self):
+        output = """stdin:1-19: WARNING: found external warnings
+HINT: include/vmlinux.h:1439:3: warning: declaration does not declare anything
+4623214882928\tgc__start:0
+4623214885575\tgc__done:0
+"""
+        self.assertEqual(
+            BPFTraceBackend._filter_probe_rows(output),
+            "4623214882928\tgc__start:0\n4623214885575\tgc__done:0",
+        )
+
+
 @unittest.skipIf(MS_WINDOWS, "Tests not compliant with trace on Windows.")
 class TraceTests:
     # unittest.TestCase options

Modules/_testinternalcapi/test_cases.c.h

@@ -1206,10 +1206,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)
 {

Modules/_testinternalcapi/test_targets.h

@@ -328,7 +328,7 @@ GETITEM(PyObject *v, Py_ssize_t i) {
 #define CONSTS() _PyFrame_GetCode(frame)->co_consts
 #define NAMES() _PyFrame_GetCode(frame)->co_names
 
-#ifdef WITH_DTRACE
+#if defined(WITH_DTRACE) && !defined(Py_BUILD_CORE_MODULE)
 static void dtrace_function_entry(_PyInterpreterFrame *);
 static void dtrace_function_return(_PyInterpreterFrame *);