maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Workaround for infinite recursion in InitOSO->GetByteSize->GetSymbolVendor. 

llvm-svn: 185491
This commit is contained in:
Jim Ingham 2013-07-03 01:21:46 +00:00
parent 78fcf490d8
commit a1e159a281
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
View File

@ -367,7 +367,13 @@ SymbolFileDWARFDebugMap::InitOSO()
{
const Symbol *symbol = symtab->SymbolAtIndex(sym_idx);
lldb::addr_t file_addr = symbol->GetAddress().GetFileAddress();
lldb::addr_t byte_size = symbol->GetByteSize();
// The N_GSYM and N_STSYM symbols have a byte size and calling
// symbol->GetByteSize() can cause an infinite loop where
// InitOSO() gets called over and over if we are in the process
// of getting the symbol vendor (module->SymbolVendor()). So
// use a safer call for now until we can fix this. This is related
// to the unified section/symtab changes that just went in.
lldb::addr_t byte_size = symtab->CalculateSymbolSize(const_cast<Symbol *>(symbol));
DebugMap::Entry debug_map_entry(file_addr, byte_size, OSOEntry(sym_idx, LLDB_INVALID_ADDRESS));
m_debug_map.Append(debug_map_entry);
}

11
lldb/source/Symbol/Symtab.cpp
View File

@ -972,15 +972,8 @@ Symtab::CalculateSymbolSize (Symbol *symbol)
if (symbol < &m_symbols.front() || symbol > &m_symbols.back())
return 0;
// See if this symbol already has a byte size?
size_t byte_size = symbol->GetByteSize();
if (byte_size)
{
// It does, just return it
return byte_size;
}
size_t byte_size = 0;
// Else if this is an address based symbol, figure out the delta between
// it and the next address based symbol
if (symbol->ValueIsAddress())