From e5a0a9048b9339a1cd00b010b7d2a1ac07eaffbd Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Thu, 11 Feb 2010 22:25:27 +0000
Subject: [PATCH] gdb/ 	* breakpoint.c (delete_breakpoint)
 <bpt->related_breakpoint != NULL>: 	New.

---
 gdb/ChangeLog    |  5 +++++
 gdb/breakpoint.c | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d9b7c607cb..17753a99d6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* breakpoint.c (delete_breakpoint) <bpt->related_breakpoint != NULL>:
+	New.
+
 2010-02-11  Pedro Alves  <pedro@codesourcery.com>
 
 	* ax-gdb.c (gen_exp_binop_rest) [BINOP_SUBSCRIPT]: Error out on
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 0d55862570..4b2daf014d 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -8691,6 +8691,16 @@ delete_breakpoint (struct breakpoint *bpt)
   if (bpt->type == bp_none)
     return;
 
+  /* At least avoid this stale reference until the reference counting of
+     breakpoints gets resolved.  */
+  if (bpt->related_breakpoint != NULL)
+    {
+      gdb_assert (bpt->related_breakpoint->related_breakpoint == bpt);
+      bpt->related_breakpoint->disposition = disp_del_at_next_stop;
+      bpt->related_breakpoint->related_breakpoint = NULL;
+      bpt->related_breakpoint = NULL;
+    }
+
   observer_notify_breakpoint_deleted (bpt->number);
 
   if (breakpoint_chain == bpt)