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

Don't assert but report & return a NULL type if we end up parsing a type we are in the middle of parsing. 

llvm-svn: 147914
This commit is contained in:
Jim Ingham 2012-01-11 02:21:12 +00:00
parent 1dd51b53b2
commit c354928786
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1916,7 +1916,17 @@ SymbolFileDWARF::ResolveType (DWARFCompileUnit* curr_cu, const DWARFDebugInfoEnt
type = GetTypeForDIE (curr_cu, type_die).get();
if (assert_not_being_parsed)
assert (type != DIE_IS_BEING_PARSED);
{
if (type != DIE_IS_BEING_PARSED)
return type;
GetObjectFile()->GetModule()->ReportError ("Parsing a die that is being parsed die: 0x%8.8x: %s %s",
type_die->GetOffset(),
DW_TAG_value_to_name(type_die->Tag()),
type_die->GetName(this, curr_cu));
}
else
return type;
}
return NULL;