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

Don't crash when we can't find a block for some reason, just try and do the right thing and fail gracefully. 

<rdar://problem/19196221>

llvm-svn: 226087
This commit is contained in:
Greg Clayton 2015-01-15 03:13:44 +00:00
parent dd669615dd
commit f7bb1fba36
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3485,9 +3485,11 @@ SymbolFileDWARF::ResolveFunction (DWARFCompileUnit *cu,
// Parse all blocks if needed // Parse all blocks if needed
if (inlined_die) if (inlined_die)
{ {
sc.block = sc.function->GetBlock (true).FindBlockByID (MakeUserID(inlined_die->GetOffset())); Block &function_block = sc.function->GetBlock (true);
assert (sc.block != NULL); sc.block = function_block.FindBlockByID (MakeUserID(inlined_die->GetOffset()));
if (sc.block->GetStartAddress (addr) == false) if (sc.block == NULL)
sc.block = function_block.FindBlockByID (inlined_die->GetOffset());
if (sc.block == NULL || sc.block->GetStartAddress (addr) == false)
addr.Clear(); addr.Clear();
} }
else else