diff options
Diffstat (limited to 'gdb/break-catch-throw.c')
| -rw-r--r-- | gdb/break-catch-throw.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c index 726825a..f5616c8 100644 --- a/gdb/break-catch-throw.c +++ b/gdb/break-catch-throw.c @@ -163,7 +163,6 @@ check_status_exception_catchpoint (struct bpstats *bs) struct exception_catchpoint *self = (struct exception_catchpoint *) bs->breakpoint_at; char *type_name = NULL; - volatile struct gdb_exception e; bkpt_breakpoint_ops.check_status (bs); if (bs->stop == 0) @@ -172,7 +171,7 @@ check_status_exception_catchpoint (struct bpstats *bs) if (self->pattern == NULL) return; - TRY_CATCH (e, RETURN_MASK_ERROR) + TRY { struct value *typeinfo_arg; char *canon; @@ -187,8 +186,11 @@ check_status_exception_catchpoint (struct bpstats *bs) type_name = canon; } } - if (e.reason < 0) - exception_print (gdb_stderr, e); + CATCH (e, RETURN_MASK_ERROR) + { + exception_print (gdb_stderr, e); + } + END_CATCH if (type_name != NULL) { @@ -206,38 +208,38 @@ re_set_exception_catchpoint (struct breakpoint *self) { struct symtabs_and_lines sals = {0}; struct symtabs_and_lines sals_end = {0}; - volatile struct gdb_exception e; struct cleanup *cleanup; enum exception_event_kind kind = classify_exception_breakpoint (self); /* We first try to use the probe interface. */ - TRY_CATCH (e, RETURN_MASK_ERROR) + TRY { char *spec = ASTRDUP (exception_functions[kind].probe); sals = parse_probes (&spec, NULL); } - if (e.reason < 0) + CATCH (e, RETURN_MASK_ERROR) { - volatile struct gdb_exception ex; /* Using the probe interface failed. Let's fallback to the normal catchpoint mode. */ - TRY_CATCH (ex, RETURN_MASK_ERROR) + TRY { char *spec = ASTRDUP (exception_functions[kind].function); self->ops->decode_linespec (self, &spec, &sals); } - if (ex.reason < 0) + CATCH (ex, RETURN_MASK_ERROR) { /* NOT_FOUND_ERROR just means the breakpoint will be pending, so let it through. */ if (ex.error != NOT_FOUND_ERROR) throw_exception (ex); } + END_CATCH } + END_CATCH cleanup = make_cleanup (xfree, sals.sals); update_breakpoint_locations (self, sals, sals_end); |