Date: Wed, 19 Mar 2014 13:24:47 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r263369 - in stable/10/contrib/llvm/tools/lldb/source: Breakpoint Symbol Message-ID: <201403191324.s2JDOlKP050015@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Wed Mar 19 13:24:47 2014 New Revision: 263369 URL: http://svnweb.freebsd.org/changeset/base/263369 Log: MFC r258897: Update LLDB to upstream r196322 snapshot Upstream revisions of note: r196298 - Fix use of std::lower_bound r196322 - Fix log message for new invalidation checks Sponsored by: DARPA, AFRL Modified: stable/10/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp stable/10/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp ============================================================================== --- stable/10/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp Wed Mar 19 13:19:56 2014 (r263368) +++ stable/10/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp Wed Mar 19 13:24:47 2014 (r263369) @@ -86,16 +86,13 @@ Compare (BreakpointLocationSP lhs, lldb: BreakpointLocationSP BreakpointLocationList::FindByID (lldb::break_id_t break_id) const { - BreakpointLocationSP bp_loc_sp; Mutex::Locker locker (m_mutex); - - collection::const_iterator begin = m_locations.begin(), end = m_locations.end(); - collection::const_iterator result; - result = std::lower_bound(begin, end, break_id, Compare); - if (result == end) - return bp_loc_sp; + collection::const_iterator end = m_locations.end(); + collection::const_iterator pos = std::lower_bound(m_locations.begin(), end, break_id, Compare); + if (pos != end && (*pos)->GetID() == break_id) + return *(pos); else - return *(result); + return BreakpointLocationSP(); } size_t Modified: stable/10/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp ============================================================================== --- stable/10/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp Wed Mar 19 13:19:56 2014 (r263368) +++ stable/10/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp Wed Mar 19 13:24:47 2014 (r263369) @@ -379,7 +379,19 @@ UnwindPlan::PlanValidAtAddress (Address { Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); if (log) - log->Printf ("Testing if UnwindPlan is valid at pc 0x%" PRIx64 ": No unwind rows - is invalid."); + { + StreamString s; + if (addr.Dump (&s, NULL, Address::DumpStyleSectionNameOffset)) + { + log->Printf ("UnwindPlan is invalid -- no unwind rows for UnwindPlan '%s' at address %s", + m_source_name.GetCString(), s.GetData()); + } + else + { + log->Printf ("UnwindPlan is invalid -- no unwind rows for UnwindPlan '%s'", + m_source_name.GetCString()); + } + } return false; } @@ -389,7 +401,19 @@ UnwindPlan::PlanValidAtAddress (Address { Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); if (log) - log->Printf ("Testing if UnwindPlan is valid at pc 0x%" PRIx64 ": No CFA register - is invalid."); + { + StreamString s; + if (addr.Dump (&s, NULL, Address::DumpStyleSectionNameOffset)) + { + log->Printf ("UnwindPlan is invalid -- no CFA register defined in row 0 for UnwindPlan '%s' at address %s", + m_source_name.GetCString(), s.GetData()); + } + else + { + log->Printf ("UnwindPlan is invalid -- no CFA register defined in row 0 for UnwindPlan '%s'", + m_source_name.GetCString()); + } + } return false; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403191324.s2JDOlKP050015>