From e029fa57819b45ef736fa272ef575e552acfa6cc Mon Sep 17 00:00:00 2001
From: Jim Ingham <jingham@apple.com>
Date: Wed, 2 Jul 2014 18:44:43 +0000
Subject: [PATCH] If a breakpoint gets deleted, any SBBreakpoints representing
 that breakpoint should return false from IsValid.

llvm-svn: 212206
---
 lldb/source/API/SBBreakpoint.cpp              |  7 +-
 lldb/test/python_api/breakpoint/Makefile      |  5 ++
 .../breakpoint/TestBreakpointAPI.py           | 65 +++++++++++++++++++
 lldb/test/python_api/breakpoint/main.c        | 14 ++++
 4 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 lldb/test/python_api/breakpoint/Makefile
 create mode 100644 lldb/test/python_api/breakpoint/TestBreakpointAPI.py
 create mode 100644 lldb/test/python_api/breakpoint/main.c

diff --git a/lldb/source/API/SBBreakpoint.cpp b/lldb/source/API/SBBreakpoint.cpp
index eb379ab12ce8..a950ca934c68 100644
--- a/lldb/source/API/SBBreakpoint.cpp
+++ b/lldb/source/API/SBBreakpoint.cpp
@@ -138,7 +138,12 @@ SBBreakpoint::GetID () const
 bool
 SBBreakpoint::IsValid() const
 {
-    return (bool) m_opaque_sp;
+    if (!m_opaque_sp)
+        return false;
+    else if (m_opaque_sp->GetTarget().GetBreakpointByID(m_opaque_sp->GetID()))
+       return true;
+    else
+        return false;
 }
 
 void
diff --git a/lldb/test/python_api/breakpoint/Makefile b/lldb/test/python_api/breakpoint/Makefile
new file mode 100644
index 000000000000..0d70f2595019
--- /dev/null
+++ b/lldb/test/python_api/breakpoint/Makefile
@@ -0,0 +1,5 @@
+LEVEL = ../../make
+
+C_SOURCES := main.c
+
+include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/python_api/breakpoint/TestBreakpointAPI.py b/lldb/test/python_api/breakpoint/TestBreakpointAPI.py
new file mode 100644
index 000000000000..ed3402d3d2ec
--- /dev/null
+++ b/lldb/test/python_api/breakpoint/TestBreakpointAPI.py
@@ -0,0 +1,65 @@
+"""
+Test SBBreakpoint APIs.
+"""
+
+import os, time
+import re
+import unittest2
+import lldb, lldbutil
+from lldbtest import *
+
+class BreakpointAPITestCase(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @python_api_test
+    @dsym_test
+    def test_breakpoint_is_valid_with_dsym(self):
+        """Make sure that if an SBBreakpoint gets deleted its IsValid returns false."""
+        self.buildDsym()
+        self.breakpoint_is_valid()
+
+    @python_api_test
+    @dwarf_test
+    def test_breakpoint_is_valid_with_dwarf(self):
+        """Make sure that if an SBBreakpoint gets deleted its IsValid returns false."""
+        self.buildDwarf()
+        self.breakpoint_is_valid ()
+
+    def setUp(self):
+        # Call super's setUp().
+        TestBase.setUp(self)
+
+    def breakpoint_is_valid(self):
+        """Get an SBBreakpoint object, delete it from the target and make sure it is no longer valid."""
+        exe = os.path.join(os.getcwd(), "a.out")
+
+        # Create a target by the debugger.
+        target = self.dbg.CreateTarget(exe)
+        self.assertTrue(target, VALID_TARGET)
+
+        # Now create a breakpoint on main.c by name 'AFunction'.
+        breakpoint = target.BreakpointCreateByName('AFunction', 'a.out')
+        #print "breakpoint:", breakpoint
+        self.assertTrue(breakpoint and
+                        breakpoint.GetNumLocations() == 1,
+                        VALID_BREAKPOINT)
+
+        # Now delete it:
+        did_delete = target.BreakpointDelete(breakpoint.GetID())
+        self.assertTrue (did_delete, "Did delete the breakpoint we just created.")
+
+        # Make sure we can't find it:
+        del_bkpt = target.FindBreakpointByID (breakpoint.GetID())
+        self.assertTrue (not del_bkpt, "We did delete the breakpoint.")
+
+        # Finally make sure the original breakpoint is no longer valid.
+        self.assertTrue (not breakpoint, "Breakpoint we deleted is no longer valid.")
+
+        
+if __name__ == '__main__':
+    import atexit
+    lldb.SBDebugger.Initialize()
+    atexit.register(lambda: lldb.SBDebugger.Terminate())
+    unittest2.main()
diff --git a/lldb/test/python_api/breakpoint/main.c b/lldb/test/python_api/breakpoint/main.c
new file mode 100644
index 000000000000..2677594e622e
--- /dev/null
+++ b/lldb/test/python_api/breakpoint/main.c
@@ -0,0 +1,14 @@
+#include <stdio.h>
+
+void
+AFunction()
+{
+  printf ("I am a function.\n");
+}
+
+int
+main ()
+{
+  AFunction();
+  return 0;
+}