https://github.com/Nerixyz updated
https://github.com/llvm/llvm-project/pull/155853
>From 8505efc3d41de3b12a4ae63a70d50055a02f06fd Mon Sep 17 00:00:00 2001
From: Nerixyz <nerix...@outlook.de>
Date: Thu, 28 Aug 2025 16:33:57 +0200
Subject: [PATCH 1/6] [LLDB][NativePDB] Set IsDynmaicCXXType metadata for
records
---
lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp | 1 -
.../Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp | 7 ++++++-
.../Plugins/SymbolFile/NativePDB/UdtRecordCompleter.h | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp
b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp
index 709281cb32709..d837eee854801 100644
--- a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp
@@ -615,7 +615,6 @@ clang::QualType
PdbAstBuilder::CreateRecordType(PdbTypeSymId id,
ClangASTMetadata metadata;
metadata.SetUserID(toOpaqueUid(id));
- metadata.SetIsDynamicCXXType(false);
CompilerType ct = m_clang.CreateRecordType(
context, OptionalClangModuleID(), access, uname,
llvm::to_underlying(ttk),
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp
b/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp
index 1c575e90bd72c..1a9d91f6d6467 100644
--- a/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp
@@ -110,9 +110,11 @@ void UdtRecordCompleter::AddMethod(llvm::StringRef name,
TypeIndex type_idx,
lldb::AccessType access_type = TranslateMemberAccess(access);
bool is_artificial = (options & MethodOptions::CompilerGenerated) ==
MethodOptions::CompilerGenerated;
+ bool is_virtual = attrs.isVirtual();
+ m_any_virtual_method = m_any_virtual_method || is_virtual;
m_ast_builder.clang().AddMethodToCXXRecordType(
derived_opaque_ty, name.data(), /*asm_label=*/{}, method_ct, access_type,
- attrs.isVirtual(), attrs.isStatic(), false, false, false, is_artificial);
+ is_virtual, attrs.isStatic(), false, false, false, is_artificial);
m_cxx_record_map[derived_opaque_ty].insert({name, method_ct});
}
@@ -336,6 +338,9 @@ void UdtRecordCompleter::complete() {
if (auto *record_decl = llvm::dyn_cast<clang::CXXRecordDecl>(&m_tag_decl)) {
m_ast_builder.GetClangASTImporter().SetRecordLayout(record_decl, m_layout);
}
+
+ if (auto meta = m_ast_builder.clang().GetMetadata(&m_tag_decl))
+ meta->SetIsDynamicCXXType(m_any_virtual_method);
}
uint64_t
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.h
b/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.h
index e6e91d0f2c3e4..08edcf39c4cd8 100644
--- a/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.h
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.h
@@ -59,6 +59,7 @@ class UdtRecordCompleter : public
llvm::codeview::TypeVisitorCallbacks {
llvm::DenseMap<lldb::opaque_compiler_type_t,
llvm::SmallSet<std::pair<llvm::StringRef, CompilerType>, 8>>
&m_cxx_record_map;
+ bool m_any_virtual_method = false;
public:
UdtRecordCompleter(
>From f4a99888577d6bcafc5ae208f2f46b8d4be8910c Mon Sep 17 00:00:00 2001
From: Nerixyz <nerix...@outlook.de>
Date: Fri, 29 Aug 2025 19:54:48 +0200
Subject: [PATCH 2/6] fix: set dynamic type based on vtable first
---
.../SymbolFile/NativePDB/PdbAstBuilder.cpp | 16 ++++++++++------
.../Plugins/SymbolFile/NativePDB/PdbAstBuilder.h | 4 ++--
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp
b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp
index d837eee854801..fd88c77021ef0 100644
--- a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp
@@ -601,20 +601,26 @@ PdbAstBuilder::CreateModifierType(const ModifierRecord
&modifier) {
}
clang::QualType PdbAstBuilder::CreateRecordType(PdbTypeSymId id,
- const TagRecord &record) {
+ const CVTagRecord &record) {
clang::DeclContext *context = nullptr;
std::string uname;
- std::tie(context, uname) = CreateDeclInfoForType(record, id.index);
+ std::tie(context, uname) = CreateDeclInfoForType(record.asTag(), id.index);
if (!context)
return {};
- clang::TagTypeKind ttk = TranslateUdtKind(record);
+ clang::TagTypeKind ttk = TranslateUdtKind(record.asTag());
lldb::AccessType access = (ttk == clang::TagTypeKind::Class)
? lldb::eAccessPrivate
: lldb::eAccessPublic;
ClangASTMetadata metadata;
metadata.SetUserID(toOpaqueUid(id));
+ // If a class has a vtable, it is dynamic.
+ // Otherwise, we wait until the record is completed - it might have virtual
+ // bases.
+ if (record.contextKind() == CompilerContextKind::ClassOrStruct &&
+ !record.asClass().getVTableShape().isNoneType())
+ metadata.SetIsDynamicCXXType(true);
CompilerType ct = m_clang.CreateRecordType(
context, OptionalClangModuleID(), access, uname,
llvm::to_underlying(ttk),
@@ -779,11 +785,9 @@ clang::QualType PdbAstBuilder::CreateType(PdbTypeSymId
type) {
if (IsTagRecord(cvt)) {
CVTagRecord tag = CVTagRecord::create(cvt);
- if (tag.kind() == CVTagRecord::Union)
- return CreateRecordType(type.index, tag.asUnion());
if (tag.kind() == CVTagRecord::Enum)
return CreateEnumType(type.index, tag.asEnum());
- return CreateRecordType(type.index, tag.asClass());
+ return CreateRecordType(type.index, tag);
}
if (cvt.kind() == LF_ARRAY) {
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.h
b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.h
index fef65227bc8f5..b965e7584d72d 100644
--- a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.h
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.h
@@ -39,6 +39,7 @@ class ClangASTImporter;
class ObjectFile;
namespace npdb {
+struct CVTagRecord;
class PdbIndex;
struct VariableInfo;
@@ -102,8 +103,7 @@ class PdbAstBuilder {
clang::QualType
CreateModifierType(const llvm::codeview::ModifierRecord &modifier);
clang::QualType CreateArrayType(const llvm::codeview::ArrayRecord &array);
- clang::QualType CreateRecordType(PdbTypeSymId id,
- const llvm::codeview::TagRecord &record);
+ clang::QualType CreateRecordType(PdbTypeSymId id, const CVTagRecord &record);
clang::QualType CreateEnumType(PdbTypeSymId id,
const llvm::codeview::EnumRecord &record);
clang::QualType
>From 2d6125cd5655e99b2a3c85fd629c52b48f9a0fc2 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerix...@outlook.de>
Date: Fri, 29 Aug 2025 19:55:04 +0200
Subject: [PATCH 3/6] fix: set dynamic type based on virtual bases
---
.../Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp | 9 ++++++---
.../Plugins/SymbolFile/NativePDB/UdtRecordCompleter.h | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp
b/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp
index 1a9d91f6d6467..f6981bffe0726 100644
--- a/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp
@@ -111,7 +111,6 @@ void UdtRecordCompleter::AddMethod(llvm::StringRef name,
TypeIndex type_idx,
bool is_artificial = (options & MethodOptions::CompilerGenerated) ==
MethodOptions::CompilerGenerated;
bool is_virtual = attrs.isVirtual();
- m_any_virtual_method = m_any_virtual_method || is_virtual;
m_ast_builder.clang().AddMethodToCXXRecordType(
derived_opaque_ty, name.data(), /*asm_label=*/{}, method_ct, access_type,
is_virtual, attrs.isStatic(), false, false, false, is_artificial);
@@ -139,6 +138,7 @@ Error UdtRecordCompleter::visitKnownMember(CVMemberRecord
&cvr,
Error UdtRecordCompleter::visitKnownMember(CVMemberRecord &cvr,
VirtualBaseClassRecord &base) {
AddBaseClassForTypeIndex(base.BaseType, base.getAccess(), base.VTableIndex);
+ m_any_virtual_base = true;
return Error::success();
}
@@ -339,8 +339,11 @@ void UdtRecordCompleter::complete() {
m_ast_builder.GetClangASTImporter().SetRecordLayout(record_decl, m_layout);
}
- if (auto meta = m_ast_builder.clang().GetMetadata(&m_tag_decl))
- meta->SetIsDynamicCXXType(m_any_virtual_method);
+ if (auto meta = m_ast_builder.clang().GetMetadata(&m_tag_decl)) {
+ meta->SetIsDynamicCXXType(meta->GetIsDynamicCXXType().value_or(false) ||
+ m_any_virtual_base);
+ m_ast_builder.clang().SetMetadata(&m_tag_decl, *meta);
+ }
}
uint64_t
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.h
b/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.h
index 08edcf39c4cd8..baf487e01d2ea 100644
--- a/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.h
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.h
@@ -59,7 +59,7 @@ class UdtRecordCompleter : public
llvm::codeview::TypeVisitorCallbacks {
llvm::DenseMap<lldb::opaque_compiler_type_t,
llvm::SmallSet<std::pair<llvm::StringRef, CompilerType>, 8>>
&m_cxx_record_map;
- bool m_any_virtual_method = false;
+ bool m_any_virtual_base = false;
public:
UdtRecordCompleter(
>From a69adc116b2515c746ea0151ede5deadc4dbc59d Mon Sep 17 00:00:00 2001
From: Nerixyz <nerix...@outlook.de>
Date: Fri, 29 Aug 2025 19:55:24 +0200
Subject: [PATCH 4/6] test: add test for dynamic types
---
.../SymbolFile/NativePDB/CMakeLists.txt | 11 ++
.../NativePDB/Inputs/DynamicTypes.cpp | 29 ++++
.../NativePDB/Inputs/DynamicTypes.exe | Bin 0 -> 3584 bytes
.../NativePDB/Inputs/DynamicTypes.pdb | Bin 0 -> 73728 bytes
.../NativePDB/SymbolFilePDBTests.cpp | 124 ++++++++++++++++++
5 files changed, 164 insertions(+)
create mode 100644 lldb/unittests/SymbolFile/NativePDB/Inputs/DynamicTypes.cpp
create mode 100644 lldb/unittests/SymbolFile/NativePDB/Inputs/DynamicTypes.exe
create mode 100644 lldb/unittests/SymbolFile/NativePDB/Inputs/DynamicTypes.pdb
create mode 100644 lldb/unittests/SymbolFile/NativePDB/SymbolFilePDBTests.cpp
diff --git a/lldb/unittests/SymbolFile/NativePDB/CMakeLists.txt
b/lldb/unittests/SymbolFile/NativePDB/CMakeLists.txt
index bfd74dd5050b4..6ee198bd85aa1 100644
--- a/lldb/unittests/SymbolFile/NativePDB/CMakeLists.txt
+++ b/lldb/unittests/SymbolFile/NativePDB/CMakeLists.txt
@@ -1,5 +1,6 @@
add_lldb_unittest(SymbolFileNativePDBTests
PdbFPOProgramToDWARFExpressionTests.cpp
+ SymbolFilePDBTests.cpp
UdtRecordCompleterTests.cpp
LINK_COMPONENTS
@@ -9,6 +10,16 @@ add_lldb_unittest(SymbolFileNativePDBTests
lldbCore
lldbHost
lldbSymbol
+ lldbPluginObjectFilePECOFF
+ lldbPluginPlatformWindows
lldbPluginSymbolFileNativePDB
+ lldbPluginSymbolFilePDB # for the pdb reader setting
lldbUtilityHelpers
)
+
+set(test_inputs
+ DynamicTypes.cpp
+ DynamicTypes.exe
+ DynamicTypes.pdb)
+
+add_unittest_inputs(SymbolFileNativePDBTests "${test_inputs}")
diff --git a/lldb/unittests/SymbolFile/NativePDB/Inputs/DynamicTypes.cpp
b/lldb/unittests/SymbolFile/NativePDB/Inputs/DynamicTypes.cpp
new file mode 100644
index 0000000000000..bbd2dfa5bbaa6
--- /dev/null
+++ b/lldb/unittests/SymbolFile/NativePDB/Inputs/DynamicTypes.cpp
@@ -0,0 +1,29 @@
+// This was used to generate `DynamicTypes.pdb`.
+
+// clang-cl /Z7 /GR- /GS- DynamicTypes.cpp -c
+// lld-link /NODEFAULTLIB /entry:main /DEBUG DynamicTypes.obj
+// rm DynamicTypes.obj
+
+struct Base {
+ virtual ~Base() = default;
+};
+
+struct UsingBase : public Base {};
+
+struct VBase {};
+
+struct UsingVBase : public virtual VBase {};
+
+struct UsingUsingVBase : public UsingVBase {};
+
+struct NotDynamic : public VBase {};
+
+void operator delete(void *, unsigned __int64 i) throw() {}
+
+int main() {
+ UsingBase ub;
+ UsingVBase uvb;
+ UsingUsingVBase uuvb;
+ NotDynamic nd;
+ return 0;
+}
diff --git a/lldb/unittests/SymbolFile/NativePDB/Inputs/DynamicTypes.exe
b/lldb/unittests/SymbolFile/NativePDB/Inputs/DynamicTypes.exe
new file mode 100644
index
0000000000000000000000000000000000000000..b1901dc70cba0640e05b23164283b2876ce6c4c5
GIT binary patch
literal 3584
zcmeHJKWGzC82_#YNo|{^rO*ySU**6IHAJUUG92|RSBN&44*to|{5fqTxrF3eT5z!u
zA=HAKi$e#84ptC4NOcfeP)a%|x`=~=!wnrA99%U1-rc+OY;_W(lzi~r_xs-azVH3M
z_bz#N@!C8|MC5~dMe#a+!Sfgo3~mHyy?tlsxfI(OnwrT~SgBmRSxyyLCS@2!lcjZ5
zo;6s`VCrOo6^dCsEEB~q5M}TA=;?=NGj92>bc#CK0uGtu&L|7QawSqYPaC%piRq@L
zIOaqX$7uSFn<R2Y;+_H8o8r!Xi4gJrnxYVO!eNZ)WOMM}LD<yiO_b?JPc|Xm!@k2{
zMAPANHf5%WzG0d$Ks??L^@xH!3YVNXn>%{2<4$;j0PVQ4o-bycp7?+r#~bvBLNw-a
zTkr_(fL7fNYPBiZuhlwbt-2N5yul^hJ$Tpd7W3L`RaUv9Eyv^$YgC}fh6H3?7jDRL
z@5B8)ej6i8sDR?yW*zlLv|3D#XiNM76tdp%5(o)t%U$_y;F=%7Bb#*y;u+}m@kl=p
z0#To=)l_+)dRy)zGoUTOU+y|D5)m?hY-VTM`MkZTSX1R|@|EyVP#{WXx4U$^TLGNT
zzOxn^jRv1m9O9e|1bmPjlNsmFtQ}B)fPj!#t{%7d(V?`8zcTc4)twXhUOr+E7%!<{
zu_$;ATMw}`oZ;$sn;sV0;6HV1^5+3c{Cqt9{kh(0=LineYy3D+&*p!{%h+za^*EwC
zQ0j5+)mOseO=(^$?)Bo{(frDpfkqh=la~`};%(3NYIJR_Ef!N*TpbJZ|Ag_;q^i#)
z^ZB{L8GH=f(laKUY&tn><V;hqn3ZH=p^z@-$8&i-c`0S)=5*vHCydf8=F|lvRmf$g
z7D{>r*IAk*pG3Z1a_pk8X<^Up8^?_$NfJpQYv;M~+=_8fY>B%A__peWK4$o=fGt9w
z0GD7NLDzv-U_U}%0)K`L^$=|VM_?zQb>KLx4t)=dcZyy>KLO*tq7Izh7vLalKXezk
XC5L1OnD_=<@vj^bMlBluaR+_@r+BwJ
literal 0
HcmV?d00001
diff --git a/lldb/unittests/SymbolFile/NativePDB/Inputs/DynamicTypes.pdb
b/lldb/unittests/SymbolFile/NativePDB/Inputs/DynamicTypes.pdb
new file mode 100644
index
0000000000000000000000000000000000000000..28bb3d6f5a9d10af26850975a2cf17bdf6cb4bd5
GIT binary patch
literal 73728
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
OKnMr{A@Ki1;Qs*08MKT5
literal 0
HcmV?d00001
diff --git a/lldb/unittests/SymbolFile/NativePDB/SymbolFilePDBTests.cpp
b/lldb/unittests/SymbolFile/NativePDB/SymbolFilePDBTests.cpp
new file mode 100644
index 0000000000000..153cb7e41803f
--- /dev/null
+++ b/lldb/unittests/SymbolFile/NativePDB/SymbolFilePDBTests.cpp
@@ -0,0 +1,124 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "Plugins/ExpressionParser/Clang/ClangASTMetadata.h"
+#include "Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h"
+#include "Plugins/Platform/Windows/PlatformWindows.h"
+#include "Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h"
+#include "Plugins/SymbolFile/NativePDB/UdtRecordCompleter.h"
+#include "Plugins/SymbolFile/PDB/SymbolFilePDB.h"
+#include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
+
+#include "TestingSupport/SubsystemRAII.h"
+#include "TestingSupport/TestUtilities.h"
+
+#include "lldb/Core/Debugger.h"
+#include "lldb/Host/HostInfo.h"
+#include "lldb/Target/Platform.h"
+#include "lldb/Utility/ArchSpec.h"
+
+#include "gtest/gtest.h"
+
+#include <optional>
+
+
+using namespace lldb_private;
+using namespace lldb_private::npdb;
+using namespace llvm;
+
+class SymbolFilePDBTests : public testing::Test {
+public:
+ void SetUp() override {
+ m_test_exe = GetInputFilePath("DynamicTypes.exe");
+
+ ArchSpec arch("x86_64-pc-windows-msvc");
+ Platform::SetHostPlatform(PlatformWindows::CreateInstance(true, &arch));
+ m_debugger_sp = Debugger::CreateInstance();
+ m_debugger_sp->SetPropertyValue(nullptr,
+ lldb_private::eVarSetOperationAssign,
+ "plugin.symbol-file.pdb.reader", "native");
+ }
+
+ std::optional<ClangASTMetadata> GetMetadataFor(SymbolFile *symfile,
+ llvm::StringRef query,
+ TypeSystemClang *clang) {
+ TypeResults results;
+ symfile->FindTypes(TypeQuery(query), results);
+ lldb::TypeSP type_sp = results.GetFirstType();
+ if (!type_sp)
+ return std::nullopt;
+
+ CompilerType ct = type_sp->GetFullCompilerType();
+ ct.GetCompleteType();
+ if (!ct.IsValid())
+ return std::nullopt;
+
+ ct.IsPossibleDynamicType(nullptr, true, false);
+
+ clang::TagDecl *tag_decl = clang->GetAsTagDecl(ct);
+ if (!tag_decl)
+ return std::nullopt;
+
+ return clang->GetMetadata(tag_decl);
+ }
+
+protected:
+ std::string m_test_exe;
+
+ SubsystemRAII<FileSystem, HostInfo, ObjectFilePECOFF, SymbolFileNativePDB,
+ SymbolFilePDB, TypeSystemClang>
+ m_subsystems;
+ lldb::DebuggerSP m_debugger_sp;
+};
+
+TEST_F(SymbolFilePDBTests, TestDynamicCxxType) {
+ FileSpec fspec(m_test_exe);
+ ArchSpec aspec("x86_64-pc-windows");
+ lldb::ModuleSP module = std::make_shared<Module>(fspec, aspec);
+
+ SymbolFile *symfile = module->GetSymbolFile();
+ ASSERT_TRUE(symfile);
+ ASSERT_TRUE(llvm::isa<SymbolFileNativePDB>(symfile));
+
+ auto ts = symfile->GetTypeSystemForLanguage(lldb::eLanguageTypeC_plus_plus);
+ ASSERT_TRUE(bool(ts));
+ TypeSystemClang *clang = llvm::dyn_cast_or_null<TypeSystemClang>(ts->get());
+ ASSERT_NE(clang, nullptr);
+
+ auto using_base_meta = GetMetadataFor(symfile, "UsingBase", clang);
+ ASSERT_TRUE(using_base_meta.has_value());
+ ASSERT_TRUE(using_base_meta->GetIsDynamicCXXType().has_value());
+ ASSERT_EQ(using_base_meta->GetIsDynamicCXXType(), true); // has vtable
+
+ auto base_meta = GetMetadataFor(symfile, "Base", clang);
+ ASSERT_TRUE(base_meta.has_value());
+ ASSERT_TRUE(base_meta->GetIsDynamicCXXType().has_value());
+ ASSERT_EQ(base_meta->GetIsDynamicCXXType(), true); // has vtable
+
+ auto vbase_meta = GetMetadataFor(symfile, "VBase", clang);
+ ASSERT_TRUE(vbase_meta.has_value());
+ ASSERT_TRUE(vbase_meta->GetIsDynamicCXXType().has_value());
+ ASSERT_EQ(vbase_meta->GetIsDynamicCXXType(), false); // empty struct
+
+ auto using_vbase_meta = GetMetadataFor(symfile, "UsingVBase", clang);
+ ASSERT_TRUE(using_vbase_meta.has_value());
+ ASSERT_TRUE(using_vbase_meta->GetIsDynamicCXXType().has_value());
+ ASSERT_EQ(using_vbase_meta->GetIsDynamicCXXType(), true); // has virtual base
+
+ auto uu_vbase_meta = GetMetadataFor(symfile, "UsingUsingVBase", clang);
+ ASSERT_TRUE(uu_vbase_meta.has_value());
+ ASSERT_TRUE(uu_vbase_meta->GetIsDynamicCXXType().has_value());
+ ASSERT_EQ(uu_vbase_meta->GetIsDynamicCXXType(),
+ true); // has 'UsingVBase' as non-virtual base
+
+ auto not_dynamic_meta = GetMetadataFor(symfile, "NotDynamic", clang);
+ ASSERT_TRUE(not_dynamic_meta.has_value());
+ ASSERT_TRUE(not_dynamic_meta->GetIsDynamicCXXType().has_value());
+ ASSERT_EQ(not_dynamic_meta->GetIsDynamicCXXType(),
+ false); // has 'VBase' as non-virtual base
+}
>From bce2f77e9012acf34dceb6e940ec35ce26146a55 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerix...@outlook.de>
Date: Fri, 29 Aug 2025 20:00:42 +0200
Subject: [PATCH 5/6] fix: formatting
---
lldb/unittests/SymbolFile/NativePDB/SymbolFilePDBTests.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/lldb/unittests/SymbolFile/NativePDB/SymbolFilePDBTests.cpp
b/lldb/unittests/SymbolFile/NativePDB/SymbolFilePDBTests.cpp
index 153cb7e41803f..b8b67b46c1339 100644
--- a/lldb/unittests/SymbolFile/NativePDB/SymbolFilePDBTests.cpp
+++ b/lldb/unittests/SymbolFile/NativePDB/SymbolFilePDBTests.cpp
@@ -26,7 +26,6 @@
#include <optional>
-
using namespace lldb_private;
using namespace lldb_private::npdb;
using namespace llvm;
>From 4d8db625595ff29e0124d6acfbdc6b79ad0956ae Mon Sep 17 00:00:00 2001
From: Nerixyz <nerix...@outlook.de>
Date: Sat, 30 Aug 2025 11:59:28 +0200
Subject: [PATCH 6/6] fix: guess path style for PDB reference from PE/COFF
---
.../Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
index 112eb06e462fc..cde8af0b7828b 100644
--- a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
@@ -118,7 +118,10 @@ loadMatchingPDBFile(std::string exe_path,
llvm::BumpPtrAllocator &allocator) {
// executable.
if (!FileSystem::Instance().Exists(pdb_file)) {
const auto exe_dir = FileSpec(exe_path).CopyByRemovingLastPathComponent();
- const auto pdb_name = FileSpec(pdb_file).GetFilename().GetCString();
+ const auto pdb_path_style =
+ FileSpec::GuessPathStyle(pdb_file).value_or(FileSpec::Style::native);
+ const auto pdb_name =
+ FileSpec(pdb_file, pdb_path_style).GetFilename().GetCString();
pdb_file =
exe_dir.CopyByAppendingPathComponent(pdb_name).GetPathAsConstString().GetStringRef();
}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
