gdb/gdb-btrobust.patch
Richard Biener e1333f9f57 - Use patchlist.pl to merge with gdb-7.8-16.fc22, a rebase to FSF GDB 4.8.
The GDB 4.8 features are:
  * Guile scripting support.
  * Python scripting enhancements.
  * New commands:
      ** guile
      ** guile-repl
      ** info auto-load guile-scripts [REGEXP]
  * New options:
      ** maint ada set ignore-descriptive-types (on|off)
      ** maint set target-async (on|off)
      ** set|show auto-load guile-scripts (on|off)
      ** set|show auto-connect-native-target
      ** set|show guile print-stack (none|message|full)
      ** set|show mi-async (on|off)
      ** set|show print symbol-loading (off|brief|full)
      ** set|show record btrace replay-memory-access (read-only|read-write)
  * Remote Protocol:
      ** The qXfer:btrace:read packet supports a new annex 'delta'.
  * GDB/MI:
      ** A new option "-gdb-set mi-async" replaces "-gdb-set target-async".
  * New target configurations:
      ** PowerPC64 GNU/Linux little-endian
  * btrace enhancements:
      ** The btrace record target now supports the 'record goto' command.
      ** The btrace record target supports limited reverse execution and
         replay.
  * ISO C99 variable length automatic arrays support.
  * It is no longer required to "set target-async on" in order to use
     background execution commands (e.g., "c&", "s&", etc.).

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=102
2014-08-11 14:08:48 +00:00

83 lines
3.0 KiB
Diff

This should fix the error with glib. An error message will still be
printed, but a default backtrace will occur in this case.
--
--- gdb-7.7.90.20140613/gdb/python/py-framefilter.c-orig 2014-06-13 03:59:37.000000000 +0200
+++ gdb-7.7.90.20140613/gdb/python/py-framefilter.c 2014-06-27 17:20:00.945271945 +0200
@@ -1475,6 +1475,7 @@ gdbpy_apply_frame_filter (const struct e
volatile struct gdb_exception except;
PyObject *item;
htab_t levels_printed;
+ int count_printed = 0;
if (!gdb_python_initialized)
return EXT_LANG_BT_NO_FILTERS;
@@ -1494,24 +1495,7 @@ gdbpy_apply_frame_filter (const struct e
iterable = bootstrap_python_frame_filters (frame, frame_low, frame_high);
if (iterable == NULL)
- {
- /* Normally if there is an error GDB prints the exception,
- abandons the backtrace and exits. The user can then call "bt
- no-filters", and get a default backtrace (it would be
- confusing to automatically start a standard backtrace halfway
- through a Python filtered backtrace). However in the case
- where GDB cannot initialize the frame filters (most likely
- due to incorrect auto-load paths), GDB has printed nothing.
- In this case it is OK to print the default backtrace after
- printing the error message. GDB returns EXT_LANG_BT_NO_FILTERS
- here to signify there are no filters after printing the
- initialization error. This return code will trigger a
- default backtrace. */
-
- gdbpy_print_stack ();
- do_cleanups (cleanups);
- return EXT_LANG_BT_NO_FILTERS;
- }
+ goto error_nothing_printed;
/* If iterable is None, then there are no frame filters registered.
If this is the case, defer to default GDB printing routines in MI
@@ -1540,15 +1524,39 @@ gdbpy_apply_frame_filter (const struct e
gdbpy_print_stack ();
Py_DECREF (item);
+ count_printed++;
}
if (item == NULL && PyErr_Occurred ())
- goto error;
+ {
+ if (count_printed > 0)
+ goto error;
+ else
+ goto error_nothing_printed;
+ }
done:
do_cleanups (cleanups);
return success;
+ /* Normally if there is an error GDB prints the exception,
+ abandons the backtrace and exits. The user can then call "bt
+ no-filters", and get a default backtrace (it would be
+ confusing to automatically start a standard backtrace halfway
+ through a Python filtered backtrace). However in the case
+ where GDB cannot initialize the frame filters (most likely
+ due to incorrect auto-load paths), GDB has printed nothing.
+ In this case it is OK to print the default backtrace after
+ printing the error message. GDB returns EXT_LANG_BT_NO_FILTERS
+ here to signify there are no filters after printing the
+ initialization error. This return code will trigger a
+ default backtrace. */
+
+ error_nothing_printed:
+ gdbpy_print_stack ();
+ do_cleanups (cleanups);
+ return EXT_LANG_BT_NO_FILTERS;
+
/* Exit and abandon backtrace on error, printing the exception that
is set. */
error: