Skip to content

[LLDB][NativePDB] Use original struct name when searching for constants #166845

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[LLDB][NativePDB] Use original struct name when searching for constants #166845

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
8 changes: 7 additions & 1 deletion lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,13 @@ Error UdtRecordCompleter::visitKnownMember(
// Static constant members may be a const[expr] declaration.
// Query the symbol's value as the variable initializer if valid.
if (member_ct.IsConst() && member_ct.IsCompleteType()) {
std::string qual_name = decl->getQualifiedNameAsString();
std::string qual_name;
if (m_record.record.kind == Member::Struct)
qual_name = (m_cvr.cr.Name + "::" + static_data_member.Name).str();
else if (m_record.record.kind == Member::Union)
qual_name = (m_cvr.ur.Name + "::" + static_data_member.Name).str();
else
qual_name = decl->getQualifiedNameAsString();

auto results =
m_index.globals().findRecordsByName(qual_name, m_index.symrecords());
Expand Down
5 changes: 4 additions & 1 deletion lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ namespace {
int AnonymousMember;
// And a nested class within an anonymous namespace
struct D {
static constexpr int StaticMember = 1;
int AnonymousDMember;
};
};
Expand Down Expand Up @@ -177,12 +178,14 @@ int SI::*mp9 = nullptr;
// CHECK: | `-CXXRecordDecl {{.*}} struct Anonymous<A::B::C<void>> definition
// CHECK: | |-FieldDecl {{.*}} AnonymousMember 'int'
// CHECK: | `-CXXRecordDecl {{.*}} struct D definition
// CHECK: | |-VarDecl {{.*}} StaticMember 'const int' static cinit
// CHECK: | | `-IntegerLiteral {{.*}} 'int' 1
// CHECK: | `-FieldDecl {{.*}} AnonymousDMember 'int'

int main(int argc, char **argv) {
AnonInt.AnonymousMember = 1;
AnonABCVoid.AnonymousMember = 2;
AnonABCVoidD.AnonymousDMember = 3;

return 0;
return AnonABCVoidD.StaticMember;
}
Loading