caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

<rdar://problem/13339196>

Browse Source 
The algorithm to access an item in a __NSArrayM was not reacting properly to deletions
The fix is to use a smarter formula that accounts for items shifting and the resulting notion of offsets in the table

llvm-svn: 178076
This commit is contained in:
Enrico Granata
2013-03-26 21:44:13 +00:00
parent 5a13d8dcea
commit b65b3030b6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/source/DataFormatters/NSArray.cpp
View File

@@ -121,7 +121,11 @@ lldb_private::formatters::NSArrayMSyntheticFrontEnd::GetChildAtIndex (size_t idx
if (idx >= CalculateNumChildren())
return lldb::ValueObjectSP();
lldb::addr_t object_at_idx = (m_data_32 ? m_data_32->_data : m_data_64->_data);
object_at_idx += (idx * m_ptr_size);
size_t pyhs_idx = idx;
pyhs_idx += (m_data_32 ? m_data_32->offset : m_data_64->offset);
if ((m_data_32 ? m_data_32->_size : m_data_64->_size) <= pyhs_idx)
pyhs_idx -= (m_data_32 ? m_data_32->_size : m_data_64->_size);
object_at_idx += (pyhs_idx * m_ptr_size);
StreamString idx_name;
idx_name.Printf("[%zu]",idx);
lldb::ValueObjectSP retval_sp = ValueObject::CreateValueObjectFromAddress(idx_name.GetData(),