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

DrgnUtils: Add isSizeComplete and underlyingType helper functions

Browse Source 
These functions are intended to be shared between OICodeGen and
TypeGraph CodeGen.
This commit is contained in:
Alastair Robertson 2023-05-24 02:33:12 -07:00 committed by Alastair Robertson
parent 75d4216016
commit 79d40fe938
4 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
oi/DrgnUtils.cpp
View File

@ -160,4 +160,30 @@ std::string typeToName(drgn_type* type) {
return typeName;
}
// This function is similar to OICodeGen::isDrgnSizeComplete(), but does not
// special-case folly::SharedMutex. This needs some more investigation and may
// need to be changed in the future.
bool isSizeComplete(struct drgn_type* type) {
uint64_t sz;
struct drgn_error* err = drgn_type_sizeof(type, &sz);
bool isComplete = (err == nullptr);
drgn_error_destroy(err);
return isComplete;
}
/*
* underlyingType
*
* Recurses through typedefs to return the underlying concrete type.
*/
drgn_type* underlyingType(drgn_type* type) {
auto* underlyingType = type;
while (drgn_type_kind(underlyingType) == DRGN_TYPE_TYPEDEF) {
underlyingType = drgn_type_type(underlyingType).type;
}
return underlyingType;
}
} // namespace drgn_utils

2
oi/DrgnUtils.h
View File

@ -141,5 +141,7 @@ void getDrgnArrayElementType(drgn_type* type,
drgn_type** outElemType,
size_t& outNumElems);
std::string typeToName(drgn_type* type);
bool isSizeComplete(struct drgn_type* type);
drgn_type* underlyingType(drgn_type* type);
} // namespace drgn_utils

26
oi/OICodeGen.cpp
View File

@ -957,7 +957,7 @@ bool OICodeGen::recordChildren(drgn_type* type) {
continue;
}
drgn_type* parent = drgnUnderlyingType(t.type);
drgn_type* parent = drgn_utils::underlyingType(t.type);
if (!isDrgnSizeComplete(parent)) {
VLOG(1) << "Incomplete size for parent class (" << drgn_type_tag(parent)
<< ") of " << drgn_type_tag(type);
@ -1132,16 +1132,6 @@ bool OICodeGen::isDrgnSizeComplete(drgn_type* type) {
return false;
}
drgn_type* OICodeGen::drgnUnderlyingType(drgn_type* type) {
auto* underlyingType = type;
while (drgn_type_kind(underlyingType) == DRGN_TYPE_TYPEDEF) {
underlyingType = drgn_type_type(underlyingType).type;
}
return underlyingType;
}
bool OICodeGen::enumerateClassParents(drgn_type* type,
const std::string& typeName) {
if (drgn_type_num_parents(type) == 0) {
@ -1531,7 +1521,7 @@ bool OICodeGen::enumeratePointerType(drgn_type* type) {
}
pointerToTypeMap.emplace(type, qtype.type);
drgn_type* underlyingType = drgnUnderlyingType(qtype.type);
drgn_type* underlyingType = drgn_utils::underlyingType(qtype.type);
bool isComplete = isDrgnSizeComplete(underlyingType);
if (drgn_type_kind(underlyingType) == DRGN_TYPE_FUNCTION || isComplete) {
@ -1667,7 +1657,7 @@ void OICodeGen::getFuncDefClassMembers(
bool skipPadding) {
if (drgn_type_kind(type) == DRGN_TYPE_TYPEDEF) {
// Handle case where parent is a typedef
getFuncDefClassMembers(code, drgnUnderlyingType(type), memberNames);
getFuncDefClassMembers(code, drgn_utils::underlyingType(type), memberNames);
return;
}
@ -2089,7 +2079,7 @@ void OICodeGen::getClassMembersIncludingParent(
drgn_type* type, std::vector<DrgnClassMemberInfo>& out) {
if (drgn_type_kind(type) == DRGN_TYPE_TYPEDEF) {
// Handle case where parent is a typedef
getClassMembersIncludingParent(drgnUnderlyingType(type), out);
getClassMembersIncludingParent(drgn_utils::underlyingType(type), out);
return;
}
@ -2343,7 +2333,7 @@ bool OICodeGen::isNumMemberGreaterThanZero(drgn_type* type) {
if (parentClasses.find(type) != parentClasses.end()) {
for (auto& p : parentClasses[type]) {
auto* underlyingType = drgnUnderlyingType(p.type);
auto* underlyingType = drgn_utils::underlyingType(p.type);
if (isNumMemberGreaterThanZero(underlyingType)) {
return true;
}
@ -2529,7 +2519,7 @@ bool OICodeGen::generateParent(
// Parent class could be a typedef
PaddingInfo paddingInfo{};
bool violatesAlignmentRequirement = false;
auto* underlyingType = drgnUnderlyingType(p);
auto* underlyingType = drgn_utils::underlyingType(p);
uint64_t offsetBits = 0;
if (!generateStructMembers(underlyingType, memberNames, code, offsetBits,
@ -2915,7 +2905,7 @@ bool OICodeGen::generateStructDefs(std::string& code) {
if (!skip) {
auto& members = classMembersMap[e];
for (auto& m : members) {
auto* underlyingType = drgnUnderlyingType(m.type);
auto* underlyingType = drgn_utils::underlyingType(m.type);
if (underlyingType != e) {
auto it2 = std::find(structDefTypeCopy.begin(),
@ -3659,7 +3649,7 @@ bool OICodeGen::staticAssertMemberOffsets(
if (drgn_type_kind(struct_type) == DRGN_TYPE_TYPEDEF) {
// Operate on the underlying type for typedefs
return staticAssertMemberOffsets(struct_name,
drgnUnderlyingType(struct_type),
drgn_utils::underlyingType(struct_type),
assert_str, memberNames, base_offset);
}

2
oi/OICodeGen.h
View File

@ -98,8 +98,6 @@ class OICodeGen {
bool isContainer(drgn_type* type);
static drgn_type* drgnUnderlyingType(drgn_type* type);
bool buildName(drgn_type* type, std::string& text, std::string& outName);
std::string typeToTransformedName(drgn_type* type);