Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[lldb/DWARF] Unique enums parsed from declarations #96751

Merged
merged 1 commit into from
Jun 27, 2024
Merged

[lldb/DWARF] Unique enums parsed from declarations #96751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,13 @@ TypeSP DWARFASTParserClang::ParseEnum(const SymbolContext &sc,
}
}
if (def_die) {
if (auto [it, inserted] = dwarf->GetDIEToType().try_emplace(
def_die.GetDIE(), DIE_IS_BEING_PARSED);
!inserted) {
if (it->getSecond() == nullptr || it->getSecond() == DIE_IS_BEING_PARSED)
return nullptr;
return it->getSecond()->shared_from_this();
}
attrs = ParsedDWARFTypeAttributes(def_die);
} else {
// No definition found. Proceed with the declaration die. We can use it to
Expand Down Expand Up @@ -1798,6 +1805,13 @@ DWARFASTParserClang::ParseStructureLikeDIE(const SymbolContext &sc,
}

if (def_die) {
if (auto [it, inserted] = dwarf->GetDIEToType().try_emplace(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any chance of reducing/avoiding this duplication? Looks like the same code here as above? (refactor into a common function?)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's possible, but I am not sure if it's worth it, as this code will go away (or at least change substantially) when we switch to lazy definition lookups.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part seems unnecessary as UniqueDWARFASTType map already handles it, right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For uniqueness, yes the unique map should already catch that (though, like we've seen, it can easily have bugs). However, it's still useful for preventing (infinite) recursion.

def_die.GetDIE(), DIE_IS_BEING_PARSED);
!inserted) {
if (it->getSecond() == nullptr || it->getSecond() == DIE_IS_BEING_PARSED)
return nullptr;
return it->getSecond()->shared_from_this();
}
attrs = ParsedDWARFTypeAttributes(def_die);
} else {
// No definition found. Proceed with the declaration die. We can use it to
Expand Down
32 changes: 32 additions & 0 deletions lldb/test/Shell/SymbolFile/DWARF/enum-declaration-uniqueness.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// RUN: %clangxx_host -gdwarf -c -o %t_a.o %s -DFILE_A
// RUN: %clangxx_host -gdwarf -c -o %t_b.o %s -DFILE_B
// RUN: %clangxx_host -o %t %t_a.o %t_b.o
// RUN: %lldb %t \
// RUN: -o "target variable my_enum my_enum_ref" -o "image dump ast" \
// RUN: -o exit | FileCheck %s


// CHECK: (lldb) target variable
// CHECK: (MyEnum) my_enum = MyEnum_A
// CHECK: (MyEnum &) my_enum_ref =
// CHECK-SAME: &::my_enum_ref = MyEnum_A

// CHECK: (lldb) image dump ast
// CHECK: EnumDecl {{.*}} MyEnum
// CHECK-NEXT: EnumConstantDecl {{.*}} MyEnum_A 'MyEnum'
// CHECK-NOT: MyEnum

enum MyEnum : int;

extern MyEnum my_enum;

#ifdef FILE_A
enum MyEnum : int { MyEnum_A };

MyEnum my_enum = MyEnum_A;

int main() {}
#endif
#ifdef FILE_B
MyEnum &my_enum_ref = my_enum;
#endif
Loading