diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/ada-lang.c | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 41dee6e..4aeb0ba 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2018-09-08 Joel Brobecker <brobecker@adacore.com> + * ada-lang.c (ada_exception_sal): Replace gdb_assert calls + by calls to error. + +2018-09-08 Joel Brobecker <brobecker@adacore.com> + * ada-lang.c (ada_unhandled_exception_name_addr_from_raise): Move update of loop variable "fi". diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 87ae275..c5cddd0 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -13215,14 +13215,11 @@ ada_exception_sal (enum ada_exception_catchpoint_kind ex, sym_name = ada_exception_sym_name (ex); sym = standard_lookup (sym_name, NULL, VAR_DOMAIN); - /* We can assume that SYM is not NULL at this stage. If the symbol - did not exist, ada_exception_support_info_sniffer would have - raised an exception. - - Also, ada_exception_support_info_sniffer should have already - verified that SYM is a function symbol. */ - gdb_assert (sym != NULL); - gdb_assert (SYMBOL_CLASS (sym) == LOC_BLOCK); + if (sym == NULL) + error (_("Catchpoint symbol not found: %s"), sym_name); + + if (SYMBOL_CLASS (sym) != LOC_BLOCK) + error (_("Unable to insert catchpoint. %s is not a function."), sym_name); /* Set ADDR_STRING. */ *addr_string = xstrdup (sym_name); |