Insert introspectable frames for each non-Python call from interpreter.

markshannon · Mar 9, 2023 · Mar 9, 2023 · Mar 10, 2023 · Mar 15, 2023 · Mar 15, 2023
commit 3e2c3ab022aaa767bd9ab8530a12570f594dba2f
@@ -206,6 +206,7 @@ def test_return_null_without_error(self):
                     r'returned NULL without setting an exception\n'
                 r'\n'
                 r'Current thread.*:\n'
+                    r'  Builtin function return_null_without_error\n'
                 r'  File .*", line 6 in <module>\n')
         else:
             with self.assertRaises(SystemError) as cm:
@@ -240,6 +241,7 @@ def test_return_result_with_error(self):
                         r'returned a result with an exception set\n'
                     r'\n'
                     r'Current thread.*:\n'
+                    r'  Builtin function return_result_with_error\n'
                     r'  File .*, line 6 in <module>\n')
         else:
             with self.assertRaises(SystemError) as cm:
@@ -262,7 +264,6 @@ def test_getitem_with_error(self):
         rc, out, err = assert_python_failure('-c', code)
         err = decode_stderr(err)
         if 'SystemError: ' not in err:
-            print(err)
             self.assertRegex(err,
                     r'Fatal Python error: _Py_CheckSlotResult: '
                         r'Slot __getitem__ of type dict succeeded '
@@ -271,6 +272,7 @@ def test_getitem_with_error(self):
                     r'ValueError: bug\n'
                     r'\n'
                     r'Current thread .* \(most recent call first\):\n'
+                    r'  Builtin function getitem_with_error\n'
                     r'  File .*, line 6 in <module>\n'
                     r'\n'
                     r'Extension modules: _testcapi \(total: 1\)\n')

diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py
@@ -489,6 +489,13 @@ def funcA():
             '  File "<string>", line 19 in <module>'
         ]
         trace, exitcode = self.get_output(code, filename, fd)
+        if trace != expected:
+            print("Trace")
+            print("-----------------")
+            print(trace)
+            print("Expected")
+            print("-----------------")
+            print(expected)
         self.assertEqual(trace, expected)
         self.assertEqual(exitcode, 0)
 

@@ -2455,17 +2455,18 @@ dummy_func(
                 JUMPBY(INLINE_CACHE_ENTRIES_CALL);
                 DISPATCH_INLINED(new_frame);
             }
+
             /* Callable is not a normal Python function */
             if (cframe.use_tracing) {
                 res = trace_call_function(
                     tstate, callable, args,
                     positional_args, kwnames);
             }
             else {
-                res = PyObject_Vectorcall(
+                CALL_WITH_NATIVE_FRAME(callable, res = PyObject_Vectorcall(
                     callable, args,
                     positional_args | PY_VECTORCALL_ARGUMENTS_OFFSET,
-                    kwnames);
+                    kwnames));
             }
             kwnames = NULL;
             assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
@@ -2606,8 +2607,8 @@ dummy_func(
             PyTypeObject *tp = (PyTypeObject *)callable;
             DEOPT_IF(tp->tp_vectorcall == NULL, CALL);
             STAT_INC(CALL, hit);
-            res = tp->tp_vectorcall((PyObject *)tp, args,
-                                    total_args - kwnames_len, kwnames);
+            CALL_WITH_NATIVE_FRAME(callable, res = tp->tp_vectorcall((PyObject *)tp, args,
+                                    total_args - kwnames_len, kwnames));
             kwnames = NULL;
             /* Free the arguments. */
             for (int i = 0; i < total_args; i++) {
@@ -2640,7 +2641,7 @@ dummy_func(
                 goto error;
             }
             PyObject *arg = args[0];
-            res = _PyCFunction_TrampolineCall(cfunc, PyCFunction_GET_SELF(callable), arg);
+            CALL_WITH_NATIVE_FRAME(callable, res = _PyCFunction_TrampolineCall(cfunc, PyCFunction_GET_SELF(callable), arg));
             _Py_LeaveRecursiveCallTstate(tstate);
             assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
 
@@ -2666,10 +2667,10 @@ dummy_func(
             STAT_INC(CALL, hit);
             PyCFunction cfunc = PyCFunction_GET_FUNCTION(callable);
             /* res = func(self, args, nargs) */
-            res = ((_PyCFunctionFast)(void(*)(void))cfunc)(
+            CALL_WITH_NATIVE_FRAME(callable, res = ((_PyCFunctionFast)(void(*)(void))cfunc)(
                 PyCFunction_GET_SELF(callable),
                 args,
-                total_args);
+                total_args));
             assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
 
             /* Free the arguments. */
@@ -2704,12 +2705,12 @@ dummy_func(
             _PyCFunctionFastWithKeywords cfunc =
                 (_PyCFunctionFastWithKeywords)(void(*)(void))
                 PyCFunction_GET_FUNCTION(callable);
-            res = cfunc(
+            CALL_WITH_NATIVE_FRAME(callable, res = cfunc(
                 PyCFunction_GET_SELF(callable),
                 args,
                 total_args - KWNAMES_LEN(),
                 kwnames
-            );
+            ));
             assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
             kwnames = NULL;
 
@@ -2738,7 +2739,8 @@ dummy_func(
             DEOPT_IF(callable != interp->callable_cache.len, CALL);
             STAT_INC(CALL, hit);
             PyObject *arg = args[0];
-            Py_ssize_t len_i = PyObject_Length(arg);
+            Py_ssize_t len_i;
+            CALL_WITH_NATIVE_FRAME(callable, len_i = PyObject_Length(arg));
             if (len_i < 0) {
                 goto error;
             }
@@ -2767,6 +2769,7 @@ dummy_func(
             STAT_INC(CALL, hit);
             PyObject *cls = args[1];
             PyObject *inst = args[0];
+
             int retval = PyObject_IsInstance(inst, cls);
             if (retval < 0) {
                 goto error;

@@ -353,3 +353,15 @@ GETITEM(PyObject *v, Py_ssize_t i) {
 
 #define KWNAMES_LEN() \
     (kwnames == NULL ? 0 : ((int)PyTuple_GET_SIZE(kwnames)))
+
+
+#define CALL_WITH_NATIVE_FRAME(_callable, _call) \
+    do { \
+        assert(cframe.current_frame == &frame->base); \
+        _PyFrame _bframe; \
+        _bframe.f_executable = _callable; \
+        _bframe.previous = &frame->base; \
+        cframe.current_frame = &_bframe; \
+        (_call); \
+        cframe.current_frame = &frame->base; \
+    } while (0)
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/traceback.c b/Python/traceback.c
@@ -1165,14 +1165,10 @@ _Py_DumpASCII(int fd, PyObject *text)
    This function is signal safe. */
 
 static void
-dump_frame(int fd, _PyFrame *f)
+dump_pyframe(int fd, _PyInterpreterFrame *frame)
 {
-    if (!PyCode_Check(f->f_executable)) {
-        return;
-    }
-    _PyInterpreterFrame *frame = (_PyInterpreterFrame *)f;
-    PyCodeObject *code =_PyFrame_GetCode(frame);
     PUTS(fd, "  File ");
+    PyCodeObject *code =_PyFrame_GetCode(frame);
     if (code->co_filename != NULL
         && PyUnicode_Check(code->co_filename))
     {
@@ -1204,6 +1200,35 @@ dump_frame(int fd, _PyFrame *f)
     PUTS(fd, "\n");
 }
 
+static void
+dump_frame(int fd, _PyFrame *f)
+{
+    PyObject * func = f->f_executable;
+    if (PyCode_Check(func)) {
+        dump_pyframe(fd, (_PyInterpreterFrame *)f);
+        return;
+    }
+    if (func == Py_None) {
+        return;
+    }
+    if (PyType_Check(func)) {
+        PUTS(fd, "  Class ");
+        PUTS(fd, ((PyTypeObject *)func)->tp_name);
+    }
+    else if (PyCFunction_Check(func)) {
+        PUTS(fd, "  Builtin function ");
+        PUTS(fd, ((PyCFunctionObject *)func)->m_ml->ml_name);
+    }
+    else if (Py_TYPE(func) == &PyMethodDescr_Type) {
+        PUTS(fd, "  Method descriptor ");
+        PUTS(fd, ((PyMethodDescrObject *)func)->d_method->ml_name);
+    }
+    else {
+        PUTS(fd, " Other");
+    }
+    PUTS(fd, "\n");
+}
+
 static void
 dump_traceback(int fd, PyThreadState *tstate, int write_header)
 {