commit 0d4f23c565c1ad971130ca038cac8e97d74b0385
author Zachary Turner <zturner@google.com> Wed Oct 05 18:40:51 2016 +0000
committer Zachary Turner <zturner@google.com> Wed Oct 05 18:40:51 2016 +0000
tree eeb73aaceaaf7ec790382533901b9ac60eadd534
parent 32aca87bf8a1fc191abf685ec3e4ff4eb55895c9

Fix some test failures due to the recent Breakpoint patch.

llvm-svn: 283358

lldb/source/Breakpoint/BreakpointIDList.cpp

diff --git a/lldb/source/Breakpoint/BreakpointIDList.cpp b/lldb/source/Breakpoint/BreakpointIDList.cpp
index 8485dcd..0f8a027 100644
--- a/lldb/source/Breakpoint/BreakpointIDList.cpp
+++ b/lldb/source/Breakpoint/BreakpointIDList.cpp
@@ -96,14 +96,8 @@
 
   for (uint32_t i = 0; i < array_size; ++i) {
     auto bp_id = BreakpointID::ParseCanonicalReference(string_array[i]);
-    if (bp_id.hasValue()) {
+    if (bp_id.hasValue())
       m_breakpoint_ids.push_back(*bp_id);
-    } else {
-      result.AppendErrorWithFormat("'%s' is not a valid breakpoint ID.\n",
-                                   string_array[i]);
-      result.SetStatus(eReturnStatusFailed);
-      return;
-    }
   }
   result.SetStatus(eReturnStatusSuccessFinishNoResult);
 }
@@ -230,8 +224,8 @@
     break_id_t start_loc_id = start_bp->GetLocationID();
     break_id_t end_bp_id = end_bp->GetBreakpointID();
     break_id_t end_loc_id = end_bp->GetLocationID();
-    if (((start_bp_id == LLDB_INVALID_BREAK_ID) &&
-            (end_bp_id != LLDB_INVALID_BREAK_ID)) ||
+    if (((start_loc_id == LLDB_INVALID_BREAK_ID) &&
+            (end_loc_id != LLDB_INVALID_BREAK_ID)) ||
         ((start_loc_id != LLDB_INVALID_BREAK_ID) &&
          (end_loc_id == LLDB_INVALID_BREAK_ID))) {
       new_args.Clear();