d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update LLDB to upstream r196322 snapshot

Browse Source 
Upstream revisions of note:
r196298 - Fix use of std::lower_bound
r196322 - Fix log message for new invalidation checks

Sponsored by:	DARPA, AFRL
This commit is contained in:
Ed Maste 2013-12-03 22:26:38 +00:00
commit a4849615b2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=258897
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp
View File

@ -86,16 +86,13 @@ Compare (BreakpointLocationSP lhs, lldb::break_id_t val)
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

28
contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp
View File

@ -379,7 +379,19 @@ UnwindPlan::PlanValidAtAddress (Address addr)
{
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 addr)
{
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;
}