fix faulthandler

Author: kumaraditya303

Include/internal/pycore_code.h

@@ -274,6 +274,8 @@ extern void _PyLineTable_InitAddressRange(
 /** API for traversing the line number table. */
 extern int _PyLineTable_NextAddressRange(PyCodeAddressRange *range);
 extern int _PyLineTable_PreviousAddressRange(PyCodeAddressRange *range);
+// This is used in dump_frame() in traceback.c without an attached tstate.
+extern int _PyCode_Addr2LineNoTstate(PyCodeObject *co, int addr);
 
 /** API for executors */
 extern void _PyCode_Clear_Executors(PyCodeObject *code);

Objects/codeobject.c

@@ -1005,20 +1005,13 @@ PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno)
  * source location tracking (co_lines/co_positions)
  ******************/
 
-int
-PyCode_Addr2Line(PyCodeObject *co, int addrq)
-{
+int _PyCode_Addr2LineNoTstate(PyCodeObject *co, int addrq){
     if (addrq < 0) {
         return co->co_firstlineno;
     }
-    int lineno = -2; // -1 is a valid line number
-    Py_BEGIN_CRITICAL_SECTION(co);
+
     if (co->_co_monitoring && co->_co_monitoring->lines) {
-        lineno = _Py_Instrumentation_GetLine(co, addrq/sizeof(_Py_CODEUNIT));
-    }
-    Py_END_CRITICAL_SECTION();
-    if (lineno != -2) {
-        return lineno;
+        return _Py_Instrumentation_GetLine(co, addrq/sizeof(_Py_CODEUNIT));
     }
 
     assert(addrq >= 0 && addrq < _PyCode_NBYTES(co));
@@ -1027,6 +1020,16 @@ PyCode_Addr2Line(PyCodeObject *co, int addrq)
     return _PyCode_CheckLineNumber(addrq, &bounds);
 }
 
+int
+PyCode_Addr2Line(PyCodeObject *co, int addrq)
+{
+    int lineno;
+    Py_BEGIN_CRITICAL_SECTION(co);
+    lineno = _PyCode_Addr2LineNoTstate(co, addrq);
+    Py_END_CRITICAL_SECTION();
+    return lineno;
+}
+
 void
 _PyLineTable_InitAddressRange(const char *linetable, Py_ssize_t length, int firstlineno, PyCodeAddressRange *range)
 {

Python/traceback.c

@@ -993,8 +993,8 @@ dump_frame(int fd, _PyInterpreterFrame *frame)
     } else {
         PUTS(fd, "???");
     }
-
-    int lineno = PyUnstable_InterpreterFrame_GetLine(frame);
+    int lasti = PyUnstable_InterpreterFrame_GetLasti(frame);
+    int lineno = _PyCode_Addr2LineNoTstate(code, lasti);
     PUTS(fd, ", line ");
     if (lineno >= 0) {
         _Py_DumpDecimal(fd, (size_t)lineno);