Skip to content

[lldb][DWARFASTParserClang] DWARFv5: support DW_TAG_variable static data members declarations #72236

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

Merged
merged 2 commits into from
Nov 15, 2023
Merged

[lldb][DWARFASTParserClang] DWARFv5: support DW_TAG_variable static data members declarations #72236

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de2be50
[lldb][DWARFASTParserClang] DWARFv5: support DW_TAG_variable static d…
Michael137 Nov 13, 2023
85f9a63
fixup! add comment
Michael137 Nov 14, 2023
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
9 changes: 7 additions & 2 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 @@ -144,7 +144,7 @@ static bool ShouldIgnoreArtificialField(llvm::StringRef FieldName) {

std::optional<DWARFFormValue>
DWARFASTParserClang::FindConstantOnVariableDefinition(DWARFDIE die) {
assert(die.Tag() == llvm::dwarf::DW_TAG_member);
assert(die.Tag() == DW_TAG_member || die.Tag() == DW_TAG_variable);

auto *dwarf = die.GetDWARF();
if (!dwarf)
Expand Down Expand Up @@ -2889,7 +2889,7 @@ void DWARFASTParserClang::CreateStaticMemberVariable(
const DWARFDIE &die, const MemberAttributes &attrs,
const lldb_private::CompilerType &class_clang_type) {
Log *log = GetLog(DWARFLog::TypeCompletion | DWARFLog::Lookups);
assert(die.Tag() == DW_TAG_member);
assert(die.Tag() == DW_TAG_member || die.Tag() == DW_TAG_variable);

Type *var_type = die.ResolveTypeUID(attrs.encoding_form.Reference());

Expand Down Expand Up @@ -2965,6 +2965,7 @@ void DWARFASTParserClang::ParseSingleMember(
// data members is DW_AT_declaration, so we check it instead.
// FIXME: Since DWARFv5, static data members are marked DW_AT_variable so we
// can consistently detect them on both GCC and Clang without below heuristic.
// Remove this block if we ever drop DWARFv4 support.
Copy link
Member

Choose a reason for hiding this comment

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

FWIW this seems extremely unlikely. It doesn't really matter, but I would've just said that the next block is specific to DWARF4.

Copy link
Member Author

Choose a reason for hiding this comment

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

Clarified here: #72495

if (attrs.member_byte_offset == UINT32_MAX &&
attrs.data_bit_offset == UINT64_MAX && attrs.is_declaration) {
CreateStaticMemberVariable(die, attrs, class_clang_type);
Expand Down Expand Up @@ -3195,6 +3196,10 @@ bool DWARFASTParserClang::ParseChildMembers(
}
break;

case DW_TAG_variable: {
const MemberAttributes attrs(die, parent_die, module_sp);
CreateStaticMemberVariable(die, attrs, class_clang_type);
} break;
case DW_TAG_member:
ParseSingleMember(die, parent_die, class_clang_type,
default_accessibility, layout_info, last_field_info);
Expand Down