diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-04-15 18:13:01 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-04-15 18:13:01 +0000 |
| commit | cc16e6c91580e68369250f5a65c6e01559cdd467 (patch) | |
| tree | 47706ed56f2acba85114112e9f24c43923fe3739 /gdb/testsuite | |
| parent | 72f1fe8a88c4dc9219c4263eff2bbcf61173e607 (diff) | |
| download | gdb-cc16e6c91580e68369250f5a65c6e01559cdd467.zip gdb-cc16e6c91580e68369250f5a65c6e01559cdd467.tar.gz gdb-cc16e6c91580e68369250f5a65c6e01559cdd467.tar.bz2 | |
PR c++/13588:
* NEWS: Update.
* break-catch-throw.c (struct exception_catchpoint)
<exception_rx, pattern>: New fields.
(fetch_probe_arguments, dtor_exception_catchpoint)
(check_status_exception_catchpoint)
(print_one_detail_exception_catchpoint): New functions.
(handle_gnu_v3_exceptions): Add "except_rx" argument.
Compile regular expression if needed.
(extract_exception_regexp): New function.
(catch_exception_command_1): Use extract_exception_regexp.
(compute_exception): Use fetch_probe_arguments.
(initialize_throw_catchpoint_ops): Set dtor, print_one_detail,
and check_status fields.
* cp-abi.c (cplus_typename_from_type_info): New function.
* cp-abi.h (cplus_typename_from_type_info): Declare.
(struct cp_abi_ops) <get_typename_from_type_info>: New field.
* gdb_regex.h (compile_rx_or_error): Declare.
* gnu-v3-abi.c (gnuv3_get_typename_from_type_info): Update
comment.
(init_gnuv3_ops): Set get_type_from_type_info field.
* probe.c (compile_rx_or_error): Move...
* utils.c (compile_rx_or_error): ... here.
gdb/doc
* gdb.texinfo (Set Catchpoints): Document regexp syntax for
exception catchpoints.
gdb/testsuite
* gdb.cp/exceptprint.exp: Add regexp catchpoint tests.
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/exceptprint.exp | 21 |
2 files changed, 25 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 855ce19..a35d9ed 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2013-04-15 Tom Tromey <tromey@redhat.com> + * gdb.cp/exceptprint.exp: Add regexp catchpoint tests. + +2013-04-15 Tom Tromey <tromey@redhat.com> + * gdb.base/default.exp: Update for $_exception. * gdb.cp/exceptprint.cc: New file. * gdb.cp/exceptprint.exp: New file. diff --git a/gdb/testsuite/gdb.cp/exceptprint.exp b/gdb/testsuite/gdb.cp/exceptprint.exp index 6e03fd9..d9f4fd5 100644 --- a/gdb/testsuite/gdb.cp/exceptprint.exp +++ b/gdb/testsuite/gdb.cp/exceptprint.exp @@ -71,3 +71,24 @@ do_exceptprint_tests string "$hex \"hi bob\"" do_exceptprint_tests int 23 do_exceptprint_tests struct "{mv = 77}" do_exceptprint_tests "reference to struct" "{mv = 77}" + + +delete_breakpoints + +if {![runto_main]} { + return -1 +} + +gdb_test "catch catch int if \$_exception == 23" \ + "Catchpoint \[0-9\]+ \\(catch\\)" \ + "catch catch" +gdb_test "catch throw int if \$_exception == 23" \ + "Catchpoint \[0-9\]+ \\(throw\\)" \ + "catch throw" +gdb_test "catch rethrow int if \$_exception == 23" \ + "Catchpoint \[0-9\]+ \\(rethrow\\)" \ + "catch rethrow" + +# This tests both the case where the regular expression does not +# match, and the case where it does. +do_exceptprint_tests int 23 |