Have Process::CreateBreakpointSite return a break_id_t instead of a user_id_t.

Also, update BreakpointLocation::ResolveBreakpointSite to check for invalid
breakpoint ID's using the proper magic constant.

llvm-svn: 108598

3 files changed, 4 insertions, 4 deletions

diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h
index 32a7cd1075d..0bdcb65355e 100644
--- a/lldb/include/lldb/Target/Process.h
+++ b/lldb/include/lldb/Target/Process.h
@@ -1170,7 +1170,7 @@ public:
     Error
     ClearBreakpointSiteByID (lldb::user_id_t break_id);
 
-    lldb::user_id_t
+    lldb::break_id_t
     CreateBreakpointSite (lldb::BreakpointLocationSP &owner,
                           bool use_hardware);
 
diff --git a/lldb/source/Breakpoint/BreakpointLocation.cpp b/lldb/source/Breakpoint/BreakpointLocation.cpp
index 46ed6dcebe1..f266142598c 100644
--- a/lldb/source/Breakpoint/BreakpointLocation.cpp
+++ b/lldb/source/Breakpoint/BreakpointLocation.cpp
@@ -229,9 +229,9 @@ BreakpointLocation::ResolveBreakpointSite ()
 
     BreakpointLocationSP myself_sp(m_owner.GetLocationSP (this));
 
-    lldb::user_id_t new_id = process->CreateBreakpointSite (myself_sp, false);
+    lldb::break_id_t new_id = process->CreateBreakpointSite (myself_sp, false);
 
-    if (new_id == LLDB_INVALID_UID)
+    if (new_id == LLDB_INVALID_BREAK_ID)
     {
         Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS);
         if (log)
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index 7bc51abb8ed..10312daf6c9 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -522,7 +522,7 @@ Process::EnableBreakpointSiteByID (lldb::user_id_t break_id)
     return error;
 }
 
-lldb::user_id_t
+lldb::break_id_t
 Process::CreateBreakpointSite (BreakpointLocationSP &owner, bool use_hardware)
 {
     const addr_t load_addr = owner->GetAddress().GetLoadAddress (this);