Skip to content

[lldb][DWARFASTParserClang] Make MemberAttributes const when parsing member DIEs #71921

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 1 commit into from
Nov 13, 2023
Merged

[lldb][DWARFASTParserClang] Make MemberAttributes const when parsing member DIEs #71921

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
36 changes: 15 additions & 21 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 @@ -2869,15 +2869,7 @@ void DWARFASTParserClang::ParseSingleMember(
const uint64_t parent_bit_size =
parent_byte_size == UINT64_MAX ? UINT64_MAX : parent_byte_size * 8;

// FIXME: Remove the workarounds below and make this const.
MemberAttributes attrs(die, parent_die, module_sp);

const bool class_is_objc_object_or_interface =
TypeSystemClang::IsObjCObjectOrInterfaceType(class_clang_type);

// FIXME: Make Clang ignore Objective-C accessibility for expressions
if (class_is_objc_object_or_interface)
attrs.accessibility = eAccessNone;
const MemberAttributes attrs(die, parent_die, module_sp);

// Handle static members, which are typically members without
// locations. However, GCC doesn't emit DW_AT_data_member_location
Expand All @@ -2892,13 +2884,13 @@ void DWARFASTParserClang::ParseSingleMember(
if (attrs.member_byte_offset == UINT32_MAX &&
attrs.data_bit_offset == UINT64_MAX && attrs.is_declaration) {
Type *var_type = die.ResolveTypeUID(attrs.encoding_form.Reference());

if (var_type) {
if (attrs.accessibility == eAccessNone)
attrs.accessibility = eAccessPublic;
const auto accessibility = attrs.accessibility == eAccessNone
? eAccessPublic
: attrs.accessibility;
CompilerType ct = var_type->GetForwardCompilerType();
clang::VarDecl *v = TypeSystemClang::AddVariableToRecordType(
class_clang_type, attrs.name, ct, attrs.accessibility);
class_clang_type, attrs.name, ct, accessibility);
if (!v) {
LLDB_LOG(log, "Failed to add variable to the record type");
return;
Expand Down Expand Up @@ -2942,8 +2934,9 @@ void DWARFASTParserClang::ParseSingleMember(
const uint64_t word_width = 32;
CompilerType member_clang_type = member_type->GetLayoutCompilerType();

if (attrs.accessibility == eAccessNone)
attrs.accessibility = default_accessibility;
const auto accessibility = attrs.accessibility == eAccessNone
? default_accessibility
: attrs.accessibility;

uint64_t field_bit_offset = (attrs.member_byte_offset == UINT32_MAX
? 0
Expand All @@ -2957,12 +2950,13 @@ void DWARFASTParserClang::ParseSingleMember(
if (attrs.data_bit_offset != UINT64_MAX) {
this_field_info.bit_offset = attrs.data_bit_offset;
} else {
if (!attrs.byte_size)
attrs.byte_size = member_type->GetByteSize(nullptr);
auto byte_size = attrs.byte_size;
if (!byte_size)
byte_size = member_type->GetByteSize(nullptr);

ObjectFile *objfile = die.GetDWARF()->GetObjectFile();
if (objfile->GetByteOrder() == eByteOrderLittle) {
this_field_info.bit_offset += attrs.byte_size.value_or(0) * 8;
this_field_info.bit_offset += byte_size.value_or(0) * 8;
this_field_info.bit_offset -= (attrs.bit_offset + attrs.bit_size);
} else {
this_field_info.bit_offset += attrs.bit_offset;
Expand Down Expand Up @@ -3001,7 +2995,7 @@ void DWARFASTParserClang::ParseSingleMember(
// unnamed bitfields if we have a new enough clang.
bool detect_unnamed_bitfields = true;

if (class_is_objc_object_or_interface)
if (TypeSystemClang::IsObjCObjectOrInterfaceType(class_clang_type))
detect_unnamed_bitfields =
die.GetCU()->Supports_unnamed_objc_bitfields();

Expand Down Expand Up @@ -3033,7 +3027,7 @@ void DWARFASTParserClang::ParseSingleMember(
class_clang_type, llvm::StringRef(),
m_ast.GetBuiltinTypeForEncodingAndBitSize(eEncodingSint,
word_width),
attrs.accessibility, unnamed_field_info->bit_size);
accessibility, unnamed_field_info->bit_size);

layout_info.field_offsets.insert(std::make_pair(
unnamed_bitfield_decl, unnamed_field_info->bit_offset));
Expand Down Expand Up @@ -3105,7 +3099,7 @@ void DWARFASTParserClang::ParseSingleMember(
TypeSystemClang::RequireCompleteType(member_clang_type);

clang::FieldDecl *field_decl = TypeSystemClang::AddFieldToRecordType(
class_clang_type, attrs.name, member_clang_type, attrs.accessibility,
class_clang_type, attrs.name, member_clang_type, accessibility,
attrs.bit_size);

m_ast.SetMetadataAsUserID(field_decl, die.GetID());
Expand Down