Skip to content

[lldb] Fix crash missing MSInheritanceAttr on CXXRecordDecl with DWARF on Windows #112928

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 7 commits into from
Oct 23, 2024
Merged

[lldb] Fix crash missing MSInheritanceAttr on CXXRecordDecl with DWARF on Windows #112928

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bb66f56
[lldb] Fix crash due to missing MSInheritanceAttr on CXXRecordDecl fo…
weliveindetail Oct 18, 2024
6f77556
Add test based on https://reviews.llvm.org/D130942#change-1PvUCFvQjDIO
weliveindetail Oct 22, 2024
a892f5e
Polish test and add coverage for Itanium
weliveindetail Oct 22, 2024
45a211e
fixup! Polish test and add coverage for Itanium
weliveindetail Oct 22, 2024
5444d5a
fixup! Polish test and add coverage for Itanium
weliveindetail Oct 22, 2024
39c6e1b
fixup! Polish test and add coverage for Itanium
weliveindetail Oct 23, 2024
644b189
fixup! Polish test and add coverage for Itanium
weliveindetail Oct 23, 2024
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
3 changes: 3 additions & 0 deletions lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2771,6 +2771,9 @@ static bool GetCompleteQualType(clang::ASTContext *ast,
ast, llvm::cast<clang::AttributedType>(qual_type)->getModifiedType(),
allow_completion);

case clang::Type::MemberPointer:
return !qual_type.getTypePtr()->isIncompleteType();
Copy link
Member

@Michael137 Michael137 Oct 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I see, so for non-MS ABI isIncompleteType will pretty much work as before, and trivially return true. Otherwise it checks for the MSInheritanceAttr. Seems reasonable to me


default:
break;
}
Expand Down
48 changes: 48 additions & 0 deletions lldb/test/Shell/SymbolFile/DWARF/x86/member-pointers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// REQUIRES: lld

// Microsoft ABI:
// RUN: %clang_cl --target=x86_64-windows-msvc -c -gdwarf %s -o %t_win.obj
// RUN: lld-link /out:%t_win.exe %t_win.obj /nodefaultlib /entry:main /debug
// RUN: %lldb -f %t_win.exe -b -o "target variable mp1 mp2 mp3 mp4 mp5 mp6 mp7 mp8 mp9"
//
// DWARF has no representation of MSInheritanceAttr, so we cannot determine the size
// of member-pointers yet. For the moment, make sure we don't crash on such variables.

// Itanium ABI:
// RUN: %clang --target=x86_64-pc-linux -gdwarf -c -o %t_linux.o %s
// RUN: ld.lld %t_linux.o -o %t_linux
// RUN: %lldb -f %t_linux -b -o "target variable mp1 mp2 mp3 mp4 mp5 mp6 mp7 mp8 mp9" | FileCheck %s
Copy link
Member Author

Choose a reason for hiding this comment

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

@Michael137 You think that's ok as test-coverage also for non-MSVC?

Copy link
Member

@Michael137 Michael137 Oct 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Yup, thanks!

Don't think we even need to link (in either case).

Also lets add a CHECK-MSVC: as well. That'd notify us once that byte-size issue gets fixed on Windows

Copy link
Member Author

Choose a reason for hiding this comment

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

Agree, added CHECK-MSVC: error: Unable to determine byte size. and dropped link-step for Itanium case. The latter doesn't seem to work for the MS case. It fails early with:

error: unable to resolve the module for file address 0x0 for variable 'mp1' in
S:\path\to\build\tools\lldb\test\Shell\SymbolFile\DWARF\x86\Output\member-pointers.cpp.tmp_win.obj

Copy link
Member

Choose a reason for hiding this comment

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

Ah fair enough, latest test changes LGTM

//
// CHECK: (char SI2::*) mp9 = 0x0000000000000000

class SI {
double si;
};
struct SI2 {
char si2;
};
class MI : SI, SI2 {
int mi;
};
class MI2 : MI {
int mi2;
};
class VI : virtual MI {
int vi;
};
class VI2 : virtual SI, virtual SI2 {
int vi;
};
class /* __unspecified_inheritance*/ UI;

double SI::* mp1 = nullptr;
int MI::* mp2 = nullptr;
int MI2::* mp3 = nullptr;
int VI::* mp4 = nullptr;
int VI2::* mp5 = nullptr;
int UI::* mp6 = nullptr;
int MI::* mp7 = nullptr;
int VI2::* mp8 = nullptr;
char SI2::* mp9 = &SI2::si2;

int main() { return 0; }
Loading