JakeHillion/object-introspection
1
0
Fork 0
mirror of https://github.com/JakeHillion/object-introspection.git synced 2024-09-19 11:09:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Flattener: Handle incomplete parent types

Browse Source
This commit is contained in:
Alastair Robertson 2023-07-11 10:49:44 -07:00 committed by Alastair Robertson
parent 0612159121
commit d45c7f4931
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oi/type_graph/Flattener.cpp
View File

@ -42,7 +42,7 @@ namespace {
void flattenParent(const Parent& parent,
std::vector<Member>& flattenedMembers) {
Type& parentType = stripTypedefs(parent.type());
if (Class* parentClass = dynamic_cast<Class*>(&parentType)) {
if (auto* parentClass = dynamic_cast<Class*>(&parentType)) {
for (size_t i = 0; i < parentClass->members.size(); i++) {
const auto& member = parentClass->members[i];
flattenedMembers.push_back(member);
@ -52,11 +52,15 @@ void flattenParent(const Parent& parent,
std::max(flattenedMembers.back().align, parentClass->align());
}
}
} else if (Container* parentContainer =
dynamic_cast<Container*>(&parentType)) {
} else if (auto* parentContainer = dynamic_cast<Container*>(&parentType)) {
// Create a new member to represent this parent container
flattenedMembers.emplace_back(*parentContainer, Flattener::ParentPrefix,
parent.bitOffset);
} else if (auto* parentPrimitive = dynamic_cast<Primitive*>(&parentType);
parentPrimitive &&
parentPrimitive->kind() == Primitive::Kind::Incomplete) {
// Bad DWARF can lead to us seeing incomplete parent types. Just ignore
// these as there is nothing we can do to recover the missing info.
} else {
throw std::runtime_error("Invalid type for parent");
}

11
test/test_flattener.cpp
View File

@ -952,3 +952,14 @@ TEST(FlattenerTest, ClassParam) {
Primitive: int32_t
)");
}
TEST(FlattenerTest, IncompleteParent) {
test(Flattener::createPass(), R"(
[0] Class: MyClass (size: 4)
Parent (offset: 0)
Primitive: void (incomplete)
)",
R"(
[0] Class: MyClass (size: 4)
)");
}