From 0d4f23c565c1ad971130ca038cac8e97d74b0385 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Wed, 5 Oct 2016 18:40:51 +0000 Subject: [PATCH] Fix some test failures due to the recent Breakpoint patch. llvm-svn: 283358 --- lldb/source/Breakpoint/BreakpointIDList.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) 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 @@ void BreakpointIDList::InsertStringArray(const char **string_array, 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 @@ void BreakpointIDList::FindAndReplaceIDRanges(Args &old_args, Target *target, 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(); -- 2.7.4