[Bug python/31425] [gdb/python, 3.12] FAIL: gdb.python/py-block.exp: check nonexistent variable

["vries at gcc dot gnu.org" <sourceware-bugzilla@sourceware.org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=31425

--- Comment #5 from Tom de Vries <vries at gcc dot gnu.org> ---
The following patch avoid the deprecated PyErr_Fetch for python >= 3.12, and
makes the FAIL disappear:
...
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index c68aff5340e..3318f8b8c35 100644
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -640,12 +640,31 @@ class gdbpy_err_fetch

   gdbpy_err_fetch ()
   {
+#if PY_VERSION_HEX < 0x030c0000
     PyObject *error_type, *error_value, *error_traceback;

     PyErr_Fetch (&error_type, &error_value, &error_traceback);
     m_error_type.reset (error_type);
     m_error_value.reset (error_value);
     m_error_traceback.reset (error_traceback);
+#else
+    PyObject *ex = PyErr_GetRaisedException ();
+    if (ex == nullptr)
+      {
+       m_error_type.reset (nullptr);
+       m_error_value.reset (nullptr);
+       m_error_traceback.reset (nullptr);
+      }
+    else
+      {
+       m_error_traceback.reset (PyException_GetTraceback (ex));
+       m_error_type.reset ((PyObject *)Py_TYPE (ex));
+       Py_INCREF (m_error_type.get ());
+       PyObject *args = PyException_GetArgs (ex);
+       m_error_value.reset (PyTuple_GetItem (args, 0));
+       Py_INCREF (m_error_value.get ());
+      }
+#endif
   }

   /* Call PyErr_Restore using the values stashed in this object.
...

-- 
You are receiving this mail because:
You are on the CC list for the bug.