Author: zturner Date: Wed Oct 5 13:40:51 2016 New Revision: 283358 URL: http://llvm.org/viewvc/llvm-project?rev=283358&view=rev Log: Fix some test failures due to the recent Breakpoint patch.
Modified: lldb/trunk/source/Breakpoint/BreakpointIDList.cpp Modified: lldb/trunk/source/Breakpoint/BreakpointIDList.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/BreakpointIDList.cpp?rev=283358&r1=283357&r2=283358&view=diff ============================================================================== --- lldb/trunk/source/Breakpoint/BreakpointIDList.cpp (original) +++ lldb/trunk/source/Breakpoint/BreakpointIDList.cpp Wed Oct 5 13:40:51 2016 @@ -96,14 +96,8 @@ void BreakpointIDList::InsertStringArray 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::FindAndReplaceIDR 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(); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits