i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

_CreateCompoundType(): Insert the type into the hash table before resolving data

Browse Source 
members. Otherwise we could run into infinite recursion.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31663 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-07-21 00:43:42 +00:00
parent 1746066cde
commit 6b56c0d739
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/debugger/debug_info/DwarfInterfaceFactory.cpp
+13 -2
View File
@@ -621,7 +621,10 @@ DwarfInterfaceFactory::_CreateType(DIEType* typeEntry, DwarfType*& _type)
if (error != B_OK) if (error != B_OK)
return error; return error;
fTypes->Insert(type); // Insert the type into the hash table. Recheck, as the type may already
// have been inserted (e.g. in the compound type case).
if (fTypes->Lookup(typeEntry) == NULL)
fTypes->Insert(type);
// try to get the type's size // try to get the type's size
uint64 size; uint64 size;
@@ -641,6 +644,7 @@ DwarfInterfaceFactory::_CreateTypeInternal(DIEType* typeEntry,
{ {
BString name; BString name;
DwarfUtils::GetFullyQualifiedDIEName(typeEntry, name); DwarfUtils::GetFullyQualifiedDIEName(typeEntry, name);
// TODO: The DIE may not have a name (e.g. pointer and reference types don't).
switch (typeEntry->Tag()) { switch (typeEntry->Tag()) {
case DW_TAG_class_type: case DW_TAG_class_type:
@@ -722,6 +726,11 @@ DwarfInterfaceFactory::_CreateCompoundType(const BString& name,
return B_NO_MEMORY; return B_NO_MEMORY;
Reference<DwarfCompoundType> typeReference(type, true); Reference<DwarfCompoundType> typeReference(type, true);
// Already add the type at this pointer to the hash table, since otherwise
// we could run into an infinite recursion when trying to create the types
// for the data members.
fTypes->Insert(type);
// find the abstract origin or specification that defines the data members // find the abstract origin or specification that defines the data members
if (typeEntry->DataMembers().IsEmpty()) { if (typeEntry->DataMembers().IsEmpty()) {
if (DIECompoundType* abstractOrigin = dynamic_cast<DIECompoundType*>( if (DIECompoundType* abstractOrigin = dynamic_cast<DIECompoundType*>(
@@ -757,8 +766,10 @@ DwarfInterfaceFactory::_CreateCompoundType(const BString& name,
DwarfDataMember* member = new(std::nothrow) DwarfDataMember(memberEntry, DwarfDataMember* member = new(std::nothrow) DwarfDataMember(memberEntry,
memberName, memberType); memberName, memberType);
Reference<DwarfDataMember> memberReference(member, true); Reference<DwarfDataMember> memberReference(member, true);
if (member == NULL || !type->AddDataMember(member)) if (member == NULL || !type->AddDataMember(member)) {
fTypes->Remove(type);
return B_NO_MEMORY; return B_NO_MEMORY;
}
} }
_type = typeReference.Detach(); _type = typeReference.Detach();