mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
d37e084783
If GDB reports a watchpoint hit, and then the next event is not
TARGET_WAITKIND_STOPPED, but instead some event for which there's a
catchpoint, such that GDB calls bpstat_stop_status, GDB mistakenly
thinks the watchpoint triggered. Vis, using foll-fork.c:
(gdb) awatch v
Hardware access (read/write) watchpoint 2: v
(gdb) catch fork
Catchpoint 3 (fork)
(gdb) c
Continuing.
Hardware access (read/write) watchpoint 2: v
Old value = 0
New value = 5
main () at gdb.base/foll-fork.c:16
16 pid = fork ();
(gdb)
Continuing.
Hardware access (read/write) watchpoint 2: v <<<<
<<<< these lines are spurious
Value = 5 <<<<
Catchpoint 3 (forked process 1712369), arch_fork (ctid=0x7ffff7fa4810) at arch-fork.h:49
49 arch-fork.h: No such file or directory.
(gdb)
The problem is that when we handle the fork event, nothing called
watchpoints_triggered before calling bpstat_stop_status. Thus, each
watchpoint's watchpoint_triggered field was still set to
watch_triggered_yes from the previous (real) watchpoint stop.
watchpoint_triggered is only current called in the handle_signal_stop
path, when handling TARGET_WAITKIND_STOPPED.
This fixes it by adding watchpoint_triggered calls in the other events
paths that call bpstat_stop_status. But instead of adding them
explicitly, it adds a new function bpstat_stop_status_nowatch that
wraps bpstat_stop_status and calls watchpoint_triggered, and then
replaces most calls to bpstat_stop_status with calls to
bpstat_stop_status_nowatch.
This required constifying watchpoints_triggered.
New test included, which fails without the fix.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28621
Change-Id: I282b38c2eee428d25319af3bc842f9feafed461c
100 lines
2.6 KiB
Plaintext
100 lines
2.6 KiB
Plaintext
# Copyright 2021-2022 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/>.
|
|
|
|
# Regression test for PR gdb/28621. Test that GDB does not misreport
|
|
# a watchpoint hit when a previous watchpoint hit is immediately
|
|
# followed by a catchpoint hit.
|
|
|
|
# This test uses "awatch".
|
|
if {[skip_hw_watchpoint_access_tests]} {
|
|
return
|
|
}
|
|
|
|
standard_testfile
|
|
|
|
if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
|
|
return
|
|
}
|
|
|
|
# Check that fork catchpoints are supported. Returns 1 if they are.
|
|
# Returns 0 and issues unsupported if they are not supported. If it
|
|
# couldn't be determined, returns 0 (but does not call unsupported).
|
|
|
|
proc_with_prefix catch_fork_supported {} {
|
|
clean_restart $::testfile
|
|
|
|
if { ![runto_main] } {
|
|
return 0
|
|
}
|
|
|
|
# Verify that the system supports "catch fork".
|
|
gdb_test "catch fork" "Catchpoint \[0-9\]* \\(fork\\)" "insert first fork catchpoint"
|
|
set has_fork_catchpoints -1
|
|
gdb_test_multiple "continue" "continue to first fork catchpoint" {
|
|
-re -wrap ".*Your system does not support this type\r\nof catchpoint.*" {
|
|
set has_fork_catchpoints 0
|
|
pass $gdb_test_name
|
|
}
|
|
-re -wrap ".*Catchpoint.*" {
|
|
set has_fork_catchpoints 1
|
|
pass $gdb_test_name
|
|
}
|
|
}
|
|
|
|
if {$has_fork_catchpoints == 1} {
|
|
return 1
|
|
} elseif {$has_fork_catchpoints == -1} {
|
|
return 0
|
|
} else {
|
|
unsupported "catch fork not supported"
|
|
return 0
|
|
}
|
|
}
|
|
|
|
# The test proper.
|
|
|
|
proc_with_prefix test {} {
|
|
clean_restart $::testfile
|
|
|
|
if { ![runto_main] } {
|
|
return 0
|
|
}
|
|
|
|
gdb_test "awatch global_var" \
|
|
"Hardware access \\(read/write\\) watchpoint .*: global_var.*" \
|
|
"watchpoint on global variable"
|
|
|
|
gdb_test "continue" \
|
|
"Hardware access \\(read/write\\) watchpoint .*: global_var.*" \
|
|
"continue to watchpoint"
|
|
|
|
set seen_watchpoint 0
|
|
gdb_test_multiple "continue" "continue to catch fork" {
|
|
-re "watchpoint" {
|
|
set seen_watchpoint 1
|
|
exp_continue
|
|
}
|
|
-re "$::gdb_prompt " {
|
|
gdb_assert { !$seen_watchpoint } $gdb_test_name
|
|
}
|
|
}
|
|
}
|
|
|
|
if {![catch_fork_supported] } {
|
|
return
|
|
}
|
|
|
|
test
|