[lldb] Infer MSInheritanceAttr for CXXRecordDecl with DWARF on Windows #115177
Conversation
|
@llvm/pr-subscribers-lldb Author: Stefan Gränitz (weliveindetail) ChangesFollowing up from #112928, we can reuse the approach from Clang Sema to infer the Full diff: https://github.com/llvm/llvm-project/pull/115177.diff 2 Files Affected:
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
index a30d898a93cc4d..319540389c05ee 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
@@ -2138,6 +2138,11 @@ bool DWARFASTParserClang::CompleteRecordType(const DWARFDIE &die,
if (record_decl)
GetClangASTImporter().SetRecordLayout(record_decl, layout_info);
+ // TODO: Only necessary if we target the Microsoft C++ ABI
+ auto IM = record_decl->calculateInheritanceModel();
+ record_decl->addAttr(clang::MSInheritanceAttr::CreateImplicit(
+ m_ast.getASTContext(), true, {}, clang::MSInheritanceAttr::Spelling(IM)));
+
// Now parse all contained types inside of the class. We make forward
// declarations to all classes, but we need the CXXRecordDecl to have decls
// for all contained types because we don't get asked for them via the
diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
index f5063175d6e070..a1e224a395e69f 100644
--- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
+++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@@ -2771,8 +2771,14 @@ static bool GetCompleteQualType(clang::ASTContext *ast,
ast, llvm::cast<clang::AttributedType>(qual_type)->getModifiedType(),
allow_completion);
- case clang::Type::MemberPointer:
+ case clang::Type::MemberPointer: {
+ auto *MPT = qual_type.getTypePtr()->castAs<clang::MemberPointerType>();
+ if (MPT->getClass()->isRecordType())
+ GetCompleteRecordType(ast, clang::QualType(MPT->getClass(), 0),
+ allow_completion);
+
return !qual_type.getTypePtr()->isIncompleteType();
+ }
default:
break;
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
| Virtual2 vi2; | ||
| Virtual3 vi3; | ||
| Virtual4 vi4; | ||
| int sum = sizeof(Single2) + sizeof(Multiple2); |
There was a problem hiding this comment.
We need to force emission of type info to DWARF right now. That's reasonable, because Clang doesn't know that we need it to infer member-pointer sizes. I guess we could teach it to do so, but in most real-world scenarios this might be a non-issue.
|
Pre-merge checks failed due to an unrelated test error. The one on Windows was fine actually, but let me squash and rebase to try this again. |
weliveindetail
force-pushed
the
lldb-msabi-member-pointers
branch
from
2a30cd9 to
b12300b
Compare
|
Btw @weliveindetail , the |
weliveindetail
force-pushed
the
lldb-msabi-member-pointers
branch
from
b12300b to
2c8f557
Compare
|
Yes, the pre-merge test failure wasn't related to my change, but still I prefer landing patches with a green light :) Was out of office last week. Let's give it one last try. |
llvm#115177) Following up from llvm#112928, we can reuse the approach from Clang Sema to infer the MSInheritanceModel and add the necessary attribute manually. This allows the inspection of member function pointers with DWARF on Windows.
llvm#115177) Following up from llvm#112928, we can reuse the approach from Clang Sema to infer the MSInheritanceModel and add the necessary attribute manually. This allows the inspection of member function pointers with DWARF on Windows. (cherry picked from commit e9dd419)
Following up from #112928, we can reuse the approach from Clang Sema to infer the
MSInheritanceModeland add the necessary attribute manually. This allows the inspection of member function pointers with DWARF on Windows.