[PATCH] Fix read and access watchpoint can't stop

[Heiher <r@hev.cc>]

gdb/ChangeLog:

2020-06-17  Heiher  <r@hev.cc>

	* breakpoint.c (bpstat_check_watchpoint):
	Fix read and access watchpoint can't stop.
---
 gdb/ChangeLog    | 5 +++++
 gdb/breakpoint.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0a2dc2275d..ecd2ef7c65 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-06-17  Heiher  <r@hev.cc>
+
+	* breakpoint.c (bpstat_check_watchpoint):
+	Fix read and access watchpoint can't stop.
+
 2020-06-17  Heiher  <r@hev.cc>
 
 	* mips-linux-nat.c (mips_linux_nat_target::can_use_hw_breakpoint):
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index aead882acd..669ae191ab 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -4952,7 +4952,7 @@ bpstat_check_watchpoint (bpstat bs)
 	   this watchpoint.  */
 	must_check_value = 1;
       else if (b->watchpoint_triggered == watch_triggered_unknown
-	       && b->type == bp_hardware_watchpoint)
+	       && is_hardware_watchpoint (bs->breakpoint_at))
 	/* We were stopped by a hardware watchpoint, but the target could
 	   not report the data address.  We must check the watchpoint's
 	   value.  Access and read watchpoints are out of luck; without
-- 
2.27.0