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

DrgnParser: Always stub function pointers

Browse Source 
This makes CodeGen v2 behave the same as CodeGen v1, and there doesn't
seem much point in following function pointers either.
This commit is contained in:
Alastair Robertson 2023-07-24 05:14:53 -07:00 committed by Alastair Robertson
parent 884b9a6e95
commit bc895dc9cc
3 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
oi/type_graph/DrgnParser.cpp
View File

@ -427,6 +427,17 @@ Typedef& DrgnParser::enumerateTypedef(struct drgn_type* type) {
return makeType<Typedef>(type, name, t);
}
static drgn_type* getPtrUnderlyingType(drgn_type* type) {
drgn_type* underlyingType = type;
while (drgn_type_kind(underlyingType) == DRGN_TYPE_POINTER ||
drgn_type_kind(underlyingType) == DRGN_TYPE_TYPEDEF) {
underlyingType = drgn_type_type(underlyingType).type;
}
return underlyingType;
}
Type& DrgnParser::enumeratePointer(struct drgn_type* type) {
if (!chasePointer()) {
return makeType<Primitive>(type, Primitive::Kind::UIntPtr);
@ -434,7 +445,9 @@ Type& DrgnParser::enumeratePointer(struct drgn_type* type) {
struct drgn_type* pointeeType = drgn_type_type(type).type;
// TODO why was old CodeGen following funciton pointers?
if (drgn_type_kind(getPtrUnderlyingType(type)) == DRGN_TYPE_FUNCTION) {
return makeType<Primitive>(type, Primitive::Kind::UIntPtr);
}
Type& t = enumerateType(pointeeType);
return makeType<Pointer>(type, t);

34
test/test_add_children.cpp
View File

@ -65,9 +65,7 @@ TEST_F(AddChildrenTest, InheritancePolymorphic) {
[0] Pointer
[1] Class: A (size: 16)
Member: _vptr$A (offset: 0)
[2] Pointer
[3] Pointer
Primitive: void
Primitive: uintptr_t
Member: int_a (offset: 8)
Primitive: int32_t
Function: ~A (virtual)
@ -75,20 +73,20 @@ TEST_F(AddChildrenTest, InheritancePolymorphic) {
Function: A
Function: A
Child
[4] Class: B (size: 40)
[2] Class: B (size: 40)
Parent (offset: 0)
[1]
Member: vec_b (offset: 16)
[5] Container: std::vector (size: 24)
[3] Container: std::vector (size: 24)
Param
Primitive: int32_t
Param
[6] Class: allocator<int> (size: 1)
[4] Class: allocator<int> (size: 1)
Param
Primitive: int32_t
Parent (offset: 0)
[7] Typedef: __allocator_base<int>
[8] Class: new_allocator<int> (size: 1)
[5] Typedef: __allocator_base<int>
[6] Class: new_allocator<int> (size: 1)
Param
Primitive: int32_t
Function: new_allocator
@ -107,9 +105,9 @@ TEST_F(AddChildrenTest, InheritancePolymorphic) {
Function: B
Function: B
Child
[9] Class: C (size: 48)
[7] Class: C (size: 48)
Parent (offset: 0)
[4]
[2]
Member: int_c (offset: 40)
Primitive: int32_t
Function: ~C (virtual)
@ -121,9 +119,7 @@ TEST_F(AddChildrenTest, InheritancePolymorphic) {
[0] Pointer
[1] Class: A (size: 16)
Member: _vptr.A (offset: 0)
[2] Pointer
[3] Pointer
Primitive: void
Primitive: uintptr_t
Member: int_a (offset: 8)
Primitive: int32_t
Function: operator=
@ -132,17 +128,17 @@ TEST_F(AddChildrenTest, InheritancePolymorphic) {
Function: ~A (virtual)
Function: myfunc (virtual)
Child
[4] Class: B (size: 40)
[2] Class: B (size: 40)
Parent (offset: 0)
[1]
Member: vec_b (offset: 16)
[5] Container: std::vector (size: 24)
[3] Container: std::vector (size: 24)
Param
Primitive: int32_t
Param
[6] Class: allocator<int> (size: 1)
[4] Class: allocator<int> (size: 1)
Parent (offset: 0)
[7] Class: new_allocator<int> (size: 1)
[5] Class: new_allocator<int> (size: 1)
Param
Primitive: int32_t
Function: new_allocator
@ -162,9 +158,9 @@ TEST_F(AddChildrenTest, InheritancePolymorphic) {
Function: ~B (virtual)
Function: myfunc (virtual)
Child
[8] Class: C (size: 48)
[6] Class: C (size: 48)
Parent (offset: 0)
[4]
[2]
Member: int_c (offset: 40)
Primitive: int32_t
Function: operator=

8
test/test_drgn_parser.cpp
View File

@ -543,9 +543,7 @@ TEST_F(DrgnParserTest, VirtualFunctions) {
[0] Pointer
[1] Class: A (size: 16)
Member: _vptr$A (offset: 0)
[2] Pointer
[3] Pointer
Primitive: void
Primitive: uintptr_t
Member: int_a (offset: 8)
Primitive: int32_t
Function: ~A (virtual)
@ -557,9 +555,7 @@ TEST_F(DrgnParserTest, VirtualFunctions) {
[0] Pointer
[1] Class: A (size: 16)
Member: _vptr.A (offset: 0)
[2] Pointer
[3] Pointer
Primitive: void
Primitive: uintptr_t
Member: int_a (offset: 8)
Primitive: int32_t
Function: operator=