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

type_graph: avoid overwriting explicitly set alignment

Browse Source 
Previously AlignmentCalc calculates the alignment and sets packing for every
type except a member with explicit alignment. Change this to check whether an
alignment has been previously set for a type before calculating it. Use this in
ClangTypeParser where the full alignment of the type is available.

Remove explicitly aligning members by the type because that was previously
reserved for members with explicit alignment. AlignmentCalc will correctly
align a member to the underlying type without this. Explicit member alignment
is still missing, as before this change.

Test plan:
- CI
- Too little. Gets further into a production type than without this change.
This commit is contained in:
Jake Hillion 2023-12-22 16:32:13 +00:00
parent beb404e41c
commit 5887b3a8dc
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
oi/type_graph/AlignmentCalc.cpp
View File

@ -50,24 +50,26 @@ void AlignmentCalc::accept(Type& type) {
void AlignmentCalc::visit(Class& c) {
RecursiveVisitor::visit(c);
uint64_t alignment = 1;
for (auto& member : c.members) {
if (member.align == 0) {
// If the member does not have an explicit alignment, calculate it from
// the member's type.
accept(member.type());
member.align = member.type().align();
}
alignment = std::max(alignment, member.align);
if (c.align() == 0) {
uint64_t alignment = 1;
for (auto& member : c.members) {
if (member.align == 0) {
// If the member does not have an explicit alignment, calculate it from
// the member's type.
accept(member.type());
member.align = member.type().align();
}
alignment = std::max(alignment, member.align);
if (member.align != 0 && (member.bitOffset / 8) % member.align != 0) {
// Mark as packed if members are not aligned
c.setPacked();
if (member.align != 0 && (member.bitOffset / 8) % member.align != 0) {
// Mark as packed if members are not aligned
c.setPacked();
}
}
c.setAlign(alignment);
}
c.setAlign(alignment);
if (c.size() % c.align() != 0) {
// Mark as packed if there is no tail padding
c.setPacked();

4
oi/type_graph/ClangTypeParser.cpp
View File

@ -175,7 +175,7 @@ Type& ClangTypeParser::enumerateClass(const clang::RecordType& ty) {
if (auto* info = getContainerInfo(fqName)) {
auto& c = makeType<Container>(ty, *info, size, nullptr);
enumerateClassTemplateParams(ty, c.templateParams);
c.setAlign(ast->getTypeAlign(clang::QualType(&ty, 0)));
c.setAlign(ast->getTypeAlign(clang::QualType(&ty, 0)) / 8);
return c;
}
@ -194,6 +194,7 @@ Type& ClangTypeParser::enumerateClass(const clang::RecordType& ty) {
auto& c = makeType<Class>(
ty, kind, std::move(name), std::move(fqName), size, virtuality);
c.setAlign(ast->getTypeAlign(clang::QualType(&ty, 0)) / 8);
enumerateClassTemplateParams(ty, c.templateParams);
// enumerateClassParents(type, c.parents);
@ -294,7 +295,6 @@ void ClangTypeParser::enumerateClassMembers(const clang::RecordType& ty,
auto& mtype = enumerateType(*qualType);
Member m{mtype, std::move(member_name), offset_in_bits, size_in_bits};
m.align = decl->getASTContext().getTypeAlign(qualType) / 8;
members.push_back(m);
}