forked from Imagelibrary/binutils-gdb
Currently, with:
(gdb) catch catch
Catchpoint 1 (catch)
(gdb) catch throw
Catchpoint 2 (throw)
(gdb) catch rethrow
Catchpoint 3 (rethrow)
You get:
(gdb) info breakpoints
Num Type Disp Enb Address What
1 breakpoint keep y 0x0000000000b122af exception catch
2 breakpoint keep y 0x0000000000b1288d exception throw
3 breakpoint keep y 0x0000000000b12931 exception rethrow
I think it doesn't make much sense usability-wise, to show a
catchpoint as a breakpoint. The fact that GDB sets a breakpoint at
some magic address in the C++ run time is an implementation detail,
IMO. And as seen in the previous patch, such a catchpoint can end up
with more than one location/address even, so showing a single address
isn't entirely accurate.
This commit hides the addresses from view, and makes GDB show
"catchpoint" for type as well:
(gdb) info breakpoints
Num Type Disp Enb Address What
1 catchpoint keep y exception catch
2 catchpoint keep y exception throw
3 catchpoint keep y exception rethrow
This comment in the code seems telling:
/* We need to reset 'type' in order for code in breakpoint.c to do
the right thing. */
cp->type = bp_breakpoint;
It kind of suggests that the reason catchpoints end up shown as
breakpoints was that it was easier to implement them that way, rather
than a desired property.
This commit fixes things up to make it possible to have bp_catch
breakpoints have software/hardware breakpoint locations, thus
eliminating the need for that hack:
- redo breakpoint_address_is_meaningful in terms of the location's
type rather than breakpoint type.
- teach bpstat_what about stepping over the catchpoint locations.
- install a allocate_location method for "catch catch/throw/rethrow",
one that forces the location type.
Note that this also reverts the gdb hunk from:
commit 2a8be20359
Commit: Tom Tromey <tom@tromey.com>
CommitDate: Sat Oct 6 22:17:45 2018 -0600
Fix Python gdb.Breakpoint.location crash
because now "catch throw" catchpoints hit the
if (obj->bp->type != bp_breakpoint)
Py_RETURN_NONE;
check above, and, adjusts the testcase to no longer expect to see the
catchpoint in the gdb.breakpoints() list.
(Note: might make sense to do the same to Ada exception catchpoints.)
gdb/ChangeLog:
2019-07-09 Pedro Alves <palves@redhat.com>
* break-catch-throw.c (print_one_exception_catchpoint): Skip the
"addr" field.
(allocate_location_exception_catchpoint): New.
(handle_gnu_v3_exceptions): Don't reset 'type' to bp_breakpoint.
(initialize_throw_catchpoint_ops): Install
allocate_location_exception_catchpoint as allocate_location
method.
* breakpoint.c (bpstat_what) <bp_catch>: Set action to
BPSTAT_WHAT_SINGLE if not stopping and the location's type is not
bp_loc_other.
(breakpoint_address_is_meaningful): Delete.
(bl_address_is_meaningful): New.
(breakpoint_locations_match): Adjust comment.
(bp_location_from_bp_type): New, factored out of...
(bp_location::bp_location(breakpoint *)): ... this.
(bp_location::bp_location(breakpoint *, bp_loc_type)): New,
factored out of...
(bp_location::bp_location(breakpoint *)): ... this. Reimplement.
(bp_loc_is_permanent): Use bl_address_is_meaningful instead of
breakpoint_address_is_meaningful.
(bp_locations_compare): Adjust comment.
(update_global_location_list): Use bl_address_is_meaningful
instead of breakpoint_address_is_meaningful.
* breakpoint.h (bp_location::bp_location(breakpoint *)): New
explicit.
(bp_location::bp_location(breakpoint *, bp_loc_type)): Declare.
* python/py-breakpoint.c (bppy_get_location): No longer check
whether location is null.
gdb/doc/ChangeLog:
2019-07-09 Pedro Alves <palves@redhat.com>
* gdb.texinfo (C++ Exception GDB/MI Catchpoint Commands): Adjust
examples to show type=catchpoint instead of type=breakpoint and an
address.
gdb/testsuite/ChangeLog:
2019-07-09 Pedro Alves <palves@redhat.com>
* gdb.cp/catch-multi-stdlib.exp: Adjust expected "info
breakpoints" output.
* gdb.cp/exception.exp: Adjust expected "info breakpoints" output.
* gdb.python/py-breakpoint.exp: No longer expect that "catch
throw" creates breakpoint.
* gdb.mi/mi-catch-cpp-exceptions.exp (setup_catchpoint): Expect
'type="catchpoint"'.
212 lines
6.5 KiB
Plaintext
212 lines
6.5 KiB
Plaintext
# Copyright 1997-2019 Free Software Foundation, Inc.
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# This file is part of the gdb testsuite.
|
|
# tests for exception-handling support
|
|
# Written by Satish Pai <pai@apollo.hp.com> 1997-07-23
|
|
# Rewritten by Michael Chastain <mec.gnu@mindspring.com> 2004-01-08
|
|
|
|
# This file used to have two copies of the tests with different
|
|
# compiler flags for hp-ux. Instead, the user should set CXXOPTS
|
|
# or run runtest with --target_board unix/gdb:debug_flags="..."
|
|
# to choose the compiler flags.
|
|
#
|
|
# The interesting compiler flags are: "aCC +A -Wl,-a,-archive" .
|
|
# Static-linked executables use a different mechanism to get the
|
|
# address of the notification hook in the C++ support library.
|
|
|
|
# TODO: this file has many absolute line numbers.
|
|
# Replace them with gdb_get_line_number.
|
|
|
|
set ws "\[\r\n\t \]+"
|
|
set nl "\[\r\n\]+"
|
|
|
|
if { [skip_stl_tests] } { continue }
|
|
|
|
# On SPU this test fails because the executable exceeds local storage size.
|
|
if { [istarget "spu*-*-*"] } {
|
|
return 0
|
|
}
|
|
|
|
standard_testfile .cc
|
|
|
|
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
|
|
return -1
|
|
}
|
|
|
|
# Set a catch catchpoint
|
|
|
|
gdb_test "catch catch" "Catchpoint \[0-9\]+ \\(catch\\)" \
|
|
"catch catch (before inferior run)"
|
|
|
|
# Set a throw catchpoint
|
|
|
|
gdb_test "catch throw" "Catchpoint \[0-9\]+ \\(throw\\)" \
|
|
"catch throw (before inferior run)"
|
|
|
|
# Set a rethrow catchpoint
|
|
|
|
gdb_test "catch rethrow" "Catchpoint \[0-9\]+ \\(rethrow\\)" \
|
|
"catch rethrow (before inferior run)"
|
|
|
|
|
|
set re_head "Num${ws}Type${ws}Disp${ws}Enb${ws}Address${ws}What"
|
|
set re_2_bp "1${ws}catchpoint${ws}keep${ws}y${ws}exception catch"
|
|
set re_3_bp "2${ws}catchpoint${ws}keep${ws}y${ws}exception throw"
|
|
set re_4_bp "3${ws}catchpoint${ws}keep${ws}y${ws}exception rethrow"
|
|
|
|
set name "info breakpoints (before inferior run)"
|
|
gdb_test_multiple "info breakpoints" $name {
|
|
-re "$re_head${ws}$re_2_bp${ws}$re_3_bp${ws}$re_4_bp\r\n$gdb_prompt $" {
|
|
pass $name
|
|
}
|
|
-re ".*$gdb_prompt $"
|
|
{
|
|
fail $name
|
|
}
|
|
}
|
|
|
|
gdb_test "tbreak main" "Temporary breakpoint 4.*" \
|
|
"Set temporary breakpoint at main"
|
|
|
|
set ok 0
|
|
gdb_run_cmd
|
|
gdb_test_multiple "" "run to main" {
|
|
-re "Temporary breakpoint 4,.*$gdb_prompt $" {
|
|
pass "run to main"
|
|
set ok 1
|
|
}
|
|
}
|
|
|
|
if { !$ok } {
|
|
continue
|
|
}
|
|
|
|
set name "info breakpoints (after inferior run)"
|
|
gdb_test_multiple "info breakpoints" $name {
|
|
-re "$re_head${ws}$re_2_bp${ws}$re_3_bp${ws}$re_4_bp\r\n$gdb_prompt $" {
|
|
pass $name
|
|
}
|
|
-re ".*$gdb_prompt $"
|
|
{
|
|
send_user "\n---\n$expect_out(buffer)\n---\n"
|
|
fail $name
|
|
}
|
|
}
|
|
|
|
gdb_test "break catcher" "Breakpoint \[0-9\]+ at.*"
|
|
|
|
# Get the first exception thrown
|
|
|
|
set name "continue to first throw"
|
|
gdb_test_multiple "continue" $name {
|
|
-re "Continuing.${ws}Catchpoint \[0-9\]+ \\(exception thrown\\), throw location.*${srcfile}:30, catch location .*${srcfile}:50\r\n$gdb_prompt $" {
|
|
pass $name
|
|
}
|
|
-re "Continuing.${ws}Catchpoint \[0-9\]+ \\(exception thrown\\).*\r\n$gdb_prompt $" {
|
|
pass $name
|
|
}
|
|
}
|
|
|
|
# Backtrace from the throw point.
|
|
# This should get to user code.
|
|
|
|
set name "backtrace after first throw"
|
|
gdb_test_multiple "backtrace" $name {
|
|
-re ".*#\[0-9\]+.*\[\[:<:\]\]__cxa_throw\[\[:>:\]\].*#\[0-9\]+${ws}$hex in foo \\(i=20\\) at .*${srcfile}:\[0-9\]+\r\n#\[0-9\]+${ws}$hex in main \\(.*\\) at .*${srcfile}:\[0-9\]+\r\n$gdb_prompt $" {
|
|
# Either __cxxabiv1::__cxa_throw or __cxa_throw can be printed
|
|
# depending on debug info presence.
|
|
pass $name
|
|
}
|
|
}
|
|
|
|
# Continue to the catch.
|
|
|
|
set name "continue to first catch"
|
|
gdb_test_multiple "continue" $name {
|
|
-re "Continuing.${ws}Catchpoint \[0-9\]+ \\(exception caught\\), throw location.*${srcfile}:30, catch location .*${srcfile}:50\r\n$gdb_prompt $" {
|
|
pass $name
|
|
}
|
|
-re "Continuing.${ws}Catchpoint \[0-9\]+ \\(exception caught\\).*\r\n$gdb_prompt $" {
|
|
pass $name
|
|
}
|
|
}
|
|
|
|
# Backtrace from the catch point.
|
|
# This should get to user code.
|
|
|
|
set name "backtrace after first catch"
|
|
gdb_test_multiple "backtrace" $name {
|
|
-re ".*#\[0-9\]+.*\[\[:<:\]\]__cxa_begin_catch\[\[:>:\]\].*#\[0-9\]+${ws}$hex in main \\(.*\\) at .*$srcfile:\[0-9\]+\r\n$gdb_prompt $" {
|
|
pass $name
|
|
}
|
|
}
|
|
|
|
# Continue to breakpoint on catcher.
|
|
gdb_test "continue" ".*catcher \\(x=13\\).*" "continue to catcher for the first time"
|
|
|
|
# Continue to second throw.
|
|
|
|
set name "continue to second throw"
|
|
gdb_test_multiple "continue" $name {
|
|
-re "Continuing.${ws}Catchpoint \[0-9\]+ \\(exception thrown\\), throw location.*${srcfile}:30, catch location .*${srcfile}:58\r\n$gdb_prompt $" {
|
|
pass $name
|
|
}
|
|
-re "Continuing.${ws}Catchpoint \[0-9\]+ \\(exception thrown\\).*\r\n$gdb_prompt $" {
|
|
pass $name
|
|
}
|
|
}
|
|
|
|
# Backtrace from the throw point.
|
|
# This should get to user code.
|
|
|
|
set name "backtrace after second throw"
|
|
gdb_test_multiple "backtrace" $name {
|
|
-re ".*#\[0-9\]+.*\[\[:<:\]\]__cxa_throw\[\[:>:\]\].*#\[0-9\]+${ws}$hex in foo \\(i=20\\) at .*${srcfile}:\[0-9\]+\r\n#\[0-9\]+${ws}$hex in main \\(.*\\) at .*${srcfile}:\[0-9\]+\r\n$gdb_prompt $" {
|
|
pass $name
|
|
}
|
|
}
|
|
|
|
# Continue to second catch.
|
|
|
|
set name "continue to second catch"
|
|
gdb_test_multiple "continue" $name {
|
|
-re "Continuing.${ws}Catchpoint \[0-9\]+ \\(exception caught\\), throw location.*${srcfile}:30, catch location .*${srcfile}:58\r\n$gdb_prompt $" {
|
|
pass $name
|
|
}
|
|
-re "Continuing.${ws}Catchpoint \[0-9\]+ \\(exception caught\\).*\r\n$gdb_prompt $" {
|
|
pass $name
|
|
}
|
|
}
|
|
|
|
# Backtrace from the catch point.
|
|
# This should get to user code.
|
|
|
|
set name "backtrace after second catch"
|
|
gdb_test_multiple "backtrace" $name {
|
|
-re ".*#\[0-9\]+.*\[\[:<:\]\]__cxa_begin_catch\[\[:>:\]\].*#\[0-9\]+${ws}$hex in main \\(.*\\) at .*$srcfile:\[0-9\]+\r\n$gdb_prompt $" {
|
|
pass $name
|
|
}
|
|
}
|
|
|
|
# Continue to breakpoint on catcher.
|
|
gdb_test "continue" ".*catcher \\(x=13\\).*" "continue to catcher for the second time"
|
|
|
|
|
|
# Continue to the re-throw.
|
|
|
|
gdb_test "continue" "Catchpoint \[0-9\]+.*exception rethrown.*" \
|
|
"continue to rethrow"
|