2017-12-08 04:31:26 +00:00
|
|
|
From a02022ce4c7a1841518e9cf17d1d9b7cade13483 Mon Sep 17 00:00:00 2001
|
2017-12-04 19:24:00 +00:00
|
|
|
From: Fedora GDB patches <invalid@email.com>
|
|
|
|
Date: Fri, 27 Oct 2017 21:07:50 +0200
|
|
|
|
Subject: gdb-btrobust.patch
|
|
|
|
|
|
|
|
FileName: gdb-btrobust.patch
|
|
|
|
|
2017-12-08 04:31:26 +00:00
|
|
|
;; Continue backtrace even if a frame filter throws an exception (Phil Muldoon).
|
|
|
|
;;=push
|
|
|
|
|
2014-06-27 15:47:58 +00:00
|
|
|
This should fix the error with glib. An error message will still be
|
|
|
|
printed, but a default backtrace will occur in this case.
|
|
|
|
|
|
|
|
--
|
2017-12-08 04:31:26 +00:00
|
|
|
---
|
|
|
|
gdb/python/py-framefilter.c | 4 +++-
|
|
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
2014-06-27 15:47:58 +00:00
|
|
|
|
2017-12-08 04:31:26 +00:00
|
|
|
diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
|
|
|
|
index 75b055c98c..9f33a7aab9 100644
|
|
|
|
--- a/gdb/python/py-framefilter.c
|
|
|
|
+++ b/gdb/python/py-framefilter.c
|
|
|
|
@@ -1388,6 +1388,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
|
2017-02-27 21:30:32 +00:00
|
|
|
htab_eq_pointer,
|
|
|
|
NULL));
|
2014-06-27 15:47:58 +00:00
|
|
|
|
2017-02-27 21:30:32 +00:00
|
|
|
+ int count_printed = 0;
|
|
|
|
while (true)
|
|
|
|
{
|
|
|
|
gdbpy_ref<> item (PyIter_Next (iterable.get ()));
|
2017-12-08 04:31:26 +00:00
|
|
|
@@ -1397,7 +1398,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
|
2017-02-27 21:30:32 +00:00
|
|
|
if (PyErr_Occurred ())
|
|
|
|
{
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
- return EXT_LANG_BT_ERROR;
|
|
|
|
+ return count_printed > 0 ? EXT_LANG_BT_ERROR : EXT_LANG_BT_NO_FILTERS;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2017-12-08 04:31:26 +00:00
|
|
|
@@ -1409,6 +1410,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
|
2015-02-14 18:33:09 +00:00
|
|
|
error and continue with other frames. */
|
|
|
|
if (success == EXT_LANG_BT_ERROR)
|
2014-06-27 15:47:58 +00:00
|
|
|
gdbpy_print_stack ();
|
|
|
|
+ count_printed++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return success;
|
2017-12-08 04:31:26 +00:00
|
|
|
--
|
|
|
|
2.14.3
|
|
|
|
|