https://github.com/Nerixyz updated
https://github.com/llvm/llvm-project/pull/154121
>From 10b3535afc063552e7d05c8e8096570887a70397 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerix...@outlook.de>
Date: Mon, 18 Aug 2025 15:56:45 +0200
Subject: [PATCH 1/2] [LLDB][NativePDB] Implement `AddSymbols`
---
.../NativePDB/SymbolFileNativePDB.cpp | 43 +++++++++++++-
.../Shell/SymbolFile/NativePDB/symtab.cpp | 59 +++++++++++++++++++
2 files changed, 101 insertions(+), 1 deletion(-)
create mode 100644 lldb/test/Shell/SymbolFile/NativePDB/symtab.cpp
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
index 112eb06e462fc..ed466d8295f65 100644
--- a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
@@ -1054,7 +1054,48 @@ lldb::LanguageType
SymbolFileNativePDB::ParseLanguage(CompileUnit &comp_unit) {
return TranslateLanguage(item->m_compile_opts->getLanguage());
}
-void SymbolFileNativePDB::AddSymbols(Symtab &symtab) {}
+void SymbolFileNativePDB::AddSymbols(Symtab &symtab) {
+ std::set<lldb::addr_t> existing_addresses;
+ for (size_t i = 0; i < symtab.GetNumSymbols(); i++)
+ existing_addresses.insert(symtab.SymbolAtIndex(i)->GetFileAddress());
+
+ auto *section_list = m_objfile_sp->GetSectionList();
+ if (!section_list)
+ return;
+
+ for (auto pid : m_index->publics().getPublicsTable()) {
+ PdbGlobalSymId global{pid, true};
+ CVSymbol sym = m_index->ReadSymbolRecord(global);
+ auto kind = sym.kind();
+ if (kind != S_PUB32)
+ continue;
+ PublicSym32 pub =
+ llvm::cantFail(SymbolDeserializer::deserializeAs<PublicSym32>(sym));
+
+ auto section_sp = section_list->FindSectionByID(pub.Segment);
+ if (!section_sp)
+ continue;
+
+ lldb::SymbolType type = eSymbolTypeData;
+ if ((pub.Flags & PublicSymFlags::Function) != PublicSymFlags::None ||
+ (pub.Flags & PublicSymFlags::Code) != PublicSymFlags::None)
+ type = eSymbolTypeCode;
+
+ symtab.AddSymbol(Symbol(/*symID=*/pid,
+ /*name=*/pub.Name,
+ /*type=*/type,
+ /*external=*/true,
+ /*is_debug=*/false,
+ /*is_trampoline=*/false,
+ /*is_artificial=*/false,
+ /*section_sp=*/section_sp,
+ /*value=*/pub.Offset,
+ /*size=*/0,
+ /*size_is_valid=*/false,
+ /*contains_linker_annotations=*/false,
+ /*flags=*/0));
+ }
+}
size_t SymbolFileNativePDB::ParseFunctions(CompileUnit &comp_unit) {
std::lock_guard<std::recursive_mutex> guard(GetModuleMutex());
diff --git a/lldb/test/Shell/SymbolFile/NativePDB/symtab.cpp
b/lldb/test/Shell/SymbolFile/NativePDB/symtab.cpp
new file mode 100644
index 0000000000000..81d643d9572d8
--- /dev/null
+++ b/lldb/test/Shell/SymbolFile/NativePDB/symtab.cpp
@@ -0,0 +1,59 @@
+// REQUIRES: x86
+
+// Test symtab reading
+// RUN: %build --compiler=clang-cl --arch=64 --nodefaultlib -o %t.exe -- %s
+// RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symtab %t.exe
--find-symbols-by-regex=".*" | FileCheck %s
+// RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symtab %t.exe
--find-symbols-by-regex=".*" | FileCheck %s
+
+struct A {
+ void something() {}
+};
+
+namespace ns {
+template <typename T> struct B {
+ struct C {
+ static int static_fn() { return 1; }
+ };
+
+ int b_func() const { return 3; }
+};
+
+struct Dyn {
+ virtual ~Dyn() = default;
+};
+
+int a_function() { return 1; }
+} // namespace ns
+
+void *operator new(unsigned long long n) { return nullptr; }
+void operator delete(void *p, unsigned long long i) {}
+
+A global_a;
+ns::B<long long>::C global_c;
+int global_int;
+
+int main(int argc, char **argv) {
+ A a;
+ a.something();
+ ns::B<int>::C::static_fn();
+ ns::B<bool>::C::static_fn();
+ ns::B<short> b;
+ ns::Dyn dyn;
+ return ns::a_function() + b.b_func();
+}
+
+// CHECK-DAG: Code {{.*}} main
+// CHECK-DAG: Code {{.*}} ?b_func@?$B@F@ns@@QEBAHXZ
+// CHECK-DAG: Code {{.*}} ?something@A@@QEAAXXZ
+// CHECK-DAG: Code {{.*}} ??_GDyn@ns@@UEAAPEAXI@Z
+// CHECK-DAG: Code {{.*}} ??2@YAPEAX_K@Z
+// CHECK-DAG: Code {{.*}} ??3@YAXPEAX_K@Z
+// CHECK-DAG: Code {{.*}} ?static_fn@C@?$B@H@ns@@SAHXZ
+// CHECK-DAG: Code {{.*}} ?a_function@ns@@YAHXZ
+// CHECK-DAG: Code {{.*}} ?static_fn@C@?$B@_N@ns@@SAHXZ
+// CHECK-DAG: Code {{.*}} ??1Dyn@ns@@UEAA@XZ
+// CHECK-DAG: Code {{.*}} ??0Dyn@ns@@QEAA@XZ
+// CHECK-DAG: Data {{.*}} ?global_int@@3HA
+// CHECK-DAG: Data {{.*}} ??_7Dyn@ns@@6B@
+// CHECK-DAG: Data {{.*}} ?global_a@@3UA@@A
+// CHECK-DAG: Data {{.*}} ?global_c@@3UC@?$B@_J@ns@@A
>From 362b562ac43cedf3ec64053afc24d1b281a294b0 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerix...@outlook.de>
Date: Mon, 18 Aug 2025 16:38:36 +0200
Subject: [PATCH 2/2] fix: tests
---
.../SymbolFile/NativePDB/disassembly.cpp | 4 +--
.../SymbolFile/NativePDB/inline_sites.test | 7 +++++
.../NativePDB/local-variables-registers.s | 30 +++++++++++++++++++
.../NativePDB/nested-blocks-same-address.s | 1 +
4 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp
b/lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp
index db3b85fa7e59f..b3f7b098a95d9 100644
--- a/lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp
@@ -18,9 +18,7 @@ int main(int argc, char **argv) {
// CHECK: (lldb) disassemble --flavor=intel -m -n main
-// CHECK: 12 int foo() { return 42; }
-// CHECK-NEXT: 13
-// CHECK-NEXT: ** 14 int main(int argc, char **argv) {
+// CHECK: ** 14 int main(int argc, char **argv) {
// CHECK: disassembly.cpp.tmp.exe`main:
// CHECK-NEXT: disassembly.cpp.tmp.exe[{{.*}}] <+0>: sub rsp, 0x38
// CHECK-NEXT: disassembly.cpp.tmp.exe[{{.*}}] <+4>: mov dword ptr [rsp +
0x34], 0x0
diff --git a/lldb/test/Shell/SymbolFile/NativePDB/inline_sites.test
b/lldb/test/Shell/SymbolFile/NativePDB/inline_sites.test
index 6293148d90ce4..769f18de51472 100644
--- a/lldb/test/Shell/SymbolFile/NativePDB/inline_sites.test
+++ b/lldb/test/Shell/SymbolFile/NativePDB/inline_sites.test
@@ -61,6 +61,7 @@
# CHECK: Function: id = {{.*}}, name = "main", range =
[0x0000000140001000-0x0000000140001046)
# CHECK: Blocks: id = {{.*}}, range = [0x140001000-0x140001046)
# CHECK: LineEntry: [0x0000000140001000-0x0000000140001004): /tmp/a.cpp:2
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001000-0x0000000140001046), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "argc", type = "int", valid
ranges = <block>, location = [0x0000000140001000, 0x000000014000102d) ->
DW_OP_reg26 XMM9
# CHECK-NEXT: Variable: id = {{.*}}, name = "argv", type = "char **", valid
ranges = <block>, location = [0x0000000140001000, 0x0000000140001045) ->
DW_OP_reg3 RBX
@@ -71,6 +72,7 @@
# CHECK: Blocks: id = {{.*}}, range = [0x140001000-0x140001046)
# CHECK-NEXT: id = {{.*}}, ranges =
[0x140001004-0x140001039)[0x14000103f-0x140001046), name = "Namespace1::foo",
decl = a.h:4
# CHECK: LineEntry: [0x0000000140001004-0x000000014000100c): /tmp/a.h:5
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001000-0x0000000140001046), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "x", type = "int", valid ranges =
<block>, location = <empty>, decl =
# CHECK-NEXT: Variable: id = {{.*}}, name = "foo_local", type = "int", valid
ranges = <block>, location = [0x0000000140001004, 0x0000000140001039) ->
DW_OP_breg7 RSP+44
# CHECK-NEXT: Variable: id = {{.*}}, name = "argc", type = "int", valid
ranges = <block>, location = [0x0000000140001000, 0x000000014000102d) ->
DW_OP_reg26 XMM9
@@ -84,6 +86,7 @@
# CHECK: Blocks: id = {{.*}}, range = [0x140001000-0x140001046)
# CHECK-NEXT: id = {{.*}}, ranges =
[0x140001004-0x140001039)[0x14000103f-0x140001046), name = "Namespace1::foo",
decl = a.h:4
# CHECK: LineEntry: [0x0000000140001010-0x0000000140001018): /tmp/a.h:7
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001000-0x0000000140001046), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "x", type = "int", valid ranges =
<block>, location = <empty>, decl =
# CHECK-NEXT: Variable: id = {{.*}}, name = "foo_local", type = "int", valid
ranges = <block>, location = [0x0000000140001004, 0x0000000140001039) ->
DW_OP_breg7 RSP+44
# CHECK-NEXT: Variable: id = {{.*}}, name = "argc", type = "int", valid
ranges = <block>, location = [0x0000000140001000, 0x000000014000102d) ->
DW_OP_reg26 XMM9
@@ -99,6 +102,7 @@
# CHECK-NEXT: id = {{.*}}, ranges =
[0x140001004-0x140001039)[0x14000103f-0x140001046), name = "Namespace1::foo",
decl = a.h:4
# CHECK-NEXT: id = {{.*}}, range = [0x14000101c-0x140001039), name
= "Class1::bar", decl = b.h:4
# CHECK: LineEntry: [0x000000014000101c-0x0000000140001022): /tmp/b.h:5
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001000-0x0000000140001046), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "x", type = "int", valid ranges =
<block>, location = [0x000000014000101c, 0x000000014000101e) -> DW_OP_reg24 XMM7
# CHECK-NEXT: Variable: id = {{.*}}, name = "bar_local", type = "int", valid
ranges = <block>, location = [0x000000014000101c, 0x0000000140001039) ->
DW_OP_breg7 RSP+52
# CHECK-NEXT: Variable: id = {{.*}}, name = "x", type = "int", valid ranges =
<block>, location = <empty>, decl =
@@ -118,6 +122,7 @@
# CHECK-NEXT: id = {{.*}}, range = [0x14000101c-0x140001039), name
= "Class1::bar", decl = b.h:4
# CHECK-NEXT: id = {{.*}}, range = [0x14000102a-0x140001039), name
= "Namespace2::Class2::func", decl = c.h:4
# CHECK: LineEntry: [0x000000014000102a-0x0000000140001031): /tmp/c.h:5
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001000-0x0000000140001046), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "x", type = "int", valid ranges =
<block>, location = [0x000000014000102a, 0x0000000140001039) -> DW_OP_reg24 XMM7
# CHECK-NEXT: Variable: id = {{.*}}, name = "func_local", type = "int", valid
ranges = <block>, location = [0x000000014000102a, 0x0000000140001039) ->
DW_OP_breg7 RSP+48
# CHECK-NEXT: Variable: id = {{.*}}, name = "bar_local", type = "int", valid
ranges = <block>, location = [0x000000014000101c, 0x0000000140001039) ->
DW_OP_breg7 RSP+52
@@ -132,6 +137,7 @@
# CHECK: Function: id = {{.*}}, name = "main", range =
[0x0000000140001000-0x0000000140001046)
# CHECK: Blocks: id = {{.*}}, range = [0x140001000-0x140001046)
# CHECK: LineEntry: [0x0000000140001039-0x000000014000103d): /tmp/a.cpp:3
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001000-0x0000000140001046), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "argv", type = "char **", valid
ranges = <block>, location = [0x0000000140001000, 0x0000000140001045) ->
DW_OP_reg3 RBX
# CHECK-NEXT: Variable: id = {{.*}}, name = "main_local", type = "int", valid
ranges = <block>, location = [0x0000000140001004, 0x0000000140001046) ->
DW_OP_breg7 RSP+48
@@ -142,6 +148,7 @@
# CHECK: Blocks: id = {{.*}}, range = [0x140001000-0x140001046)
# CHECK-NEXT: id = {{.*}}, ranges =
[0x140001004-0x140001039)[0x14000103f-0x140001046), name = "Namespace1::foo",
decl = a.h:4
# CHECK: LineEntry: [0x0000000140001044-0x0000000140001046): /tmp/a.h:8
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001000-0x0000000140001046), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "x", type = "int", valid ranges =
<block>, location = <empty>, decl =
# CHECK-NEXT: Variable: id = {{.*}}, name = "foo_local", type = "int", valid
ranges = <block>, location = [0x0000000140001044, 0x0000000140001046) ->
DW_OP_breg7 RSP+44
# CHECK-NEXT: Variable: id = {{.*}}, name = "argc", type = "int", valid
ranges = <block>, location = [0x0000000140001044, 0x0000000140001045) ->
DW_OP_reg26 XMM9
diff --git a/lldb/test/Shell/SymbolFile/NativePDB/local-variables-registers.s
b/lldb/test/Shell/SymbolFile/NativePDB/local-variables-registers.s
index 85d92a2447939..fe2f397d60c01 100644
--- a/lldb/test/Shell/SymbolFile/NativePDB/local-variables-registers.s
+++ b/lldb/test/Shell/SymbolFile/NativePDB/local-variables-registers.s
@@ -34,38 +34,46 @@
# CHECK: (lldb) image lookup -a 0x140001000 -v
# CHECK: LineEntry: [0x0000000140001000-0x0000000140001003):
C:\src\test\a.cpp:10
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001000-0x0000000140001011), name="struct S CreateS(int, char)",
mangled="?CreateS@@YA?AUS@@HD@Z"
# CHECK-NEXT: Variable: id = {{.*}}, name = "p1", type = "int", valid
ranges = <block>, location = [0x0000000140001000, 0x0000000140001003) ->
DW_OP_reg26 XMM9
# CHECK-NEXT: Variable: id = {{.*}}, name = "p2", type = "char", valid
ranges = <block>, location = [0x0000000140001000, 0x0000000140001006) ->
DW_OP_regx 0x3f
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001003 -v
# CHECK: LineEntry: [0x0000000140001003-0x0000000140001006):
C:\src\test\a.cpp:11
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001000-0x0000000140001011), name="struct S CreateS(int, char)",
mangled="?CreateS@@YA?AUS@@HD@Z"
# CHECK-NEXT: Variable: id = {{.*}}, name = "p2", type = "char", valid
ranges = <block>, location = [0x0000000140001000, 0x0000000140001006) ->
DW_OP_regx 0x3f
# CHECK-NEXT: Variable: id = {{.*}}, name = "s", type = "S", valid ranges
= <block>, location = [0x0000000140001003, 0x0000000140001006) -> DW_OP_piece
0x4, DW_OP_regx 0x3f, DW_OP_piece 0x1, DW_OP_piece 0x3
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001006 -v
# CHECK: LineEntry: [0x0000000140001006-0x0000000140001011):
C:\src\test\a.cpp:12
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001000-0x0000000140001011), name="struct S CreateS(int, char)",
mangled="?CreateS@@YA?AUS@@HD@Z"
# CHECK-NEXT: Variable: id = {{.*}}, name = "s", type = "S", valid ranges
= <block>, location = [0x0000000140001006, 0x0000000140001011) -> DW_OP_reg26
XMM9, DW_OP_piece 0x4, DW_OP_regx 0x3f, DW_OP_piece 0x1, DW_OP_piece 0x3
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001011 -v
# CHECK: LineEntry: [0x0000000140001011-0x0000000140001015):
C:\src\test\a.cpp:15
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "argc", type = "int", valid
ranges = <block>, location = [0x0000000140001011, 0x0000000140001017) ->
DW_OP_reg26 XMM9
# CHECK-NEXT: Variable: id = {{.*}}, name = "argv", type = "char **",
valid ranges = <block>, location = [0x0000000140001011, 0x0000000140001019) ->
DW_OP_reg3 RBX
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001017 -v
# CHECK: LineEntry: [0x0000000140001017-0x000000014000101e):
C:\src\test\a.cpp:17
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "argv", type = "char **",
valid ranges = <block>, location = [0x0000000140001011, 0x0000000140001019) ->
DW_OP_reg3 RBX
# CHECK-NEXT: Variable: id = {{.*}}, name = "local", type = "int", valid
ranges = <block>, location = [0x0000000140001017, 0x000000014000101e) ->
DW_OP_reg26 XMM9
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001019 -v
# CHECK: LineEntry: [0x0000000140001017-0x000000014000101e):
C:\src\test\a.cpp:17
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "local", type = "int", valid
ranges = <block>, location = [0x0000000140001017, 0x000000014000101e) ->
DW_OP_reg26 XMM9
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x14000101e -v
# CHECK: LineEntry: [0x000000014000101e-0x0000000140001031):
C:\src\test\a.cpp:18
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "s", type = "S", valid ranges
= <block>, location = [0x000000014000101e, 0x000000014000102c) -> DW_OP_reg24
XMM7, DW_OP_piece 0x4, DW_OP_piece 0x4
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x14000102c -v
# CHECK: LineEntry: [0x000000014000101e-0x0000000140001031):
C:\src\test\a.cpp:18
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
.text
.def @feat.00;
@@ -406,14 +414,17 @@ main: # @main
.short .Ltmp103-.Ltmp102
# CHECK: (lldb) image lookup -a 0x140001031 -v
# CHECK: LineEntry: [0x0000000140001031-0x0000000140001034):
C:\src\test\a.cpp:1000
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "non_overlapped_ranges", type
= "S1", valid ranges = <block>, location = [0x0000000140001031,
0x0000000140001032) -> DW_OP_reg3 RBX
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001032 -v
# CHECK: LineEntry: [0x0000000140001031-0x0000000140001034):
C:\src\test\a.cpp:1000
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "non_overlapped_ranges", type
= "S1", valid ranges = <block>, location = [0x0000000140001032,
0x0000000140001033) -> DW_OP_reg2 RCX
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001033 -v
# CHECK: LineEntry: [0x0000000140001031-0x0000000140001034):
C:\src\test\a.cpp:1000
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "non_overlapped_ranges", type
= "S1", valid ranges = <block>, location = [0x0000000140001033,
0x0000000140001034) -> DW_OP_reg8 R8
# CHECK-EMPTY:
@@ -431,18 +442,22 @@ main: # @main
.short .Ltmp105-.Ltmp104
# CHECK: (lldb) image lookup -a 0x140001034 -v
# CHECK: LineEntry: [0x0000000140001034-0x000000014000103b):
C:\src\test\a.cpp:1001
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_subfield_ranges",
type = "S1", valid ranges = <block>, location = [0x0000000140001034,
0x0000000140001035) -> DW_OP_regx 0x3f, DW_OP_piece 0x1, DW_OP_piece 0x7
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001035 -v
# CHECK: LineEntry: [0x0000000140001034-0x000000014000103b):
C:\src\test\a.cpp:1001
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_subfield_ranges",
type = "S1", valid ranges = <block>, location = [0x0000000140001035,
0x0000000140001036) -> DW_OP_regx 0x3f, DW_OP_piece 0x1, DW_OP_piece 0x3,
DW_OP_reg24 XMM7, DW_OP_piece 0x4
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001036 -v
# CHECK: LineEntry: [0x0000000140001034-0x000000014000103b):
C:\src\test\a.cpp:1001
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_subfield_ranges",
type = "S1", valid ranges = <block>, location = [0x0000000140001036,
0x0000000140001037) -> DW_OP_piece 0x4, DW_OP_reg24 XMM7, DW_OP_piece 0x4
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001037 -v
# CHECK: LineEntry: [0x0000000140001034-0x000000014000103b):
C:\src\test\a.cpp:1001
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_subfield_ranges",
type = "S1", valid ranges = <block>, location = [0x0000000140001037,
0x0000000140001039) -> DW_OP_piece 0x4, DW_OP_reg26 XMM9, DW_OP_piece 0x4
# CHECK-EMPTY:
@@ -461,22 +476,27 @@ main: # @main
.short .Ltmp107-.Ltmp106
# CHECK: (lldb) image lookup -a 0x14000103b -v
# CHECK: LineEntry: [0x000000014000103b-0x0000000140001045):
C:\src\test\a.cpp:1002
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_ranges_2", type =
"S1", valid ranges = <block>, location = [0x000000014000103b,
0x000000014000103c) -> DW_OP_reg3 RBX
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x14000103d -v
# CHECK: LineEntry: [0x000000014000103b-0x0000000140001045):
C:\src\test\a.cpp:1002
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_ranges_2", type =
"S1", valid ranges = <block>, location = [0x000000014000103c,
0x000000014000103e) -> DW_OP_reg2 RCX
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x14000103f -v
# CHECK: LineEntry: [0x000000014000103b-0x0000000140001045):
C:\src\test\a.cpp:1002
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_ranges_2", type =
"S1", valid ranges = <block>, location = [0x000000014000103f,
0x0000000140001041) -> DW_OP_reg11 R11
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001041 -v
# CHECK: LineEntry: [0x000000014000103b-0x0000000140001045):
C:\src\test\a.cpp:1002
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_ranges_2", type =
"S1", valid ranges = <block>, location = [0x0000000140001041,
0x0000000140001043) -> DW_OP_reg0 RAX
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001043 -v
# CHECK: LineEntry: [0x000000014000103b-0x0000000140001045):
C:\src\test\a.cpp:1002
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_ranges_2", type =
"S1", valid ranges = <block>, location = [0x0000000140001043,
0x0000000140001044) -> DW_OP_reg11 R11
# CHECK-EMPTY:
@@ -505,33 +525,41 @@ main: # @main
.short .Ltmp109-.Ltmp108
# CHECK: (lldb) image lookup -a 0x140001045 -v
# CHECK: LineEntry: [0x0000000140001045-0x000000014000104e):
C:\src\test\a.cpp:1003
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_ranges_3", type =
"S1", valid ranges = <block>, location = [0x0000000140001045,
0x0000000140001046) -> DW_OP_regx 0x3f, DW_OP_piece 0x1, DW_OP_piece 0x7
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001046 -v
# CHECK: LineEntry: [0x0000000140001045-0x000000014000104e):
C:\src\test\a.cpp:1003
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_ranges_3", type =
"S1", valid ranges = <block>, location = [0x0000000140001046,
0x0000000140001047) -> DW_OP_regx 0x3f, DW_OP_piece 0x1, DW_OP_piece 0x3,
DW_OP_reg24 XMM7, DW_OP_piece 0x4
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001047 -v
# CHECK: LineEntry: [0x0000000140001045-0x000000014000104e):
C:\src\test\a.cpp:1003
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_ranges_3", type =
"S1", valid ranges = <block>, location = [0x0000000140001047,
0x0000000140001048) -> DW_OP_reg3 RBX
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001048 -v
# CHECK: LineEntry: [0x0000000140001045-0x000000014000104e):
C:\src\test\a.cpp:1003
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_ranges_3", type =
"S1", valid ranges = <block>, location = [0x0000000140001048,
0x0000000140001049) -> DW_OP_regx 0x3f, DW_OP_piece 0x1, DW_OP_piece 0x3,
DW_OP_reg24 XMM7, DW_OP_piece 0x4
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x140001049 -v
# CHECK: LineEntry: [0x0000000140001045-0x000000014000104e):
C:\src\test\a.cpp:1003
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_ranges_3", type =
"S1", valid ranges = <block>, location = [0x0000000140001049,
0x000000014000104a) -> DW_OP_reg0 RAX
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x14000104a -v
# CHECK: LineEntry: [0x0000000140001045-0x000000014000104e):
C:\src\test\a.cpp:1003
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x14000104b -v
# CHECK: LineEntry: [0x0000000140001045-0x000000014000104e):
C:\src\test\a.cpp:1003
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_ranges_3", type =
"S1", valid ranges = <block>, location = [0x000000014000104b,
0x000000014000104e) -> DW_OP_reg2 RCX
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x14000104c -v
# CHECK: LineEntry: [0x0000000140001045-0x000000014000104e):
C:\src\test\a.cpp:1003
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "overlapped_ranges_3", type =
"S1", valid ranges = <block>, location = [0x000000014000104b,
0x000000014000104e) -> DW_OP_reg2 RCX
# CHECK-EMPTY:
@@ -549,10 +577,12 @@ main: # @main
.short 4431 # Record kind: S_PROC_ID_END
# CHECK: (lldb) image lookup -a 0x14000104e -v
# CHECK: LineEntry: [0x000000014000104e-0x0000000140001050):
C:\src\test\a.cpp:1004
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "simple_type1", type =
"int64_t", valid ranges = <block>, location = [0x000000014000104e,
0x000000014000104f) -> DW_OP_reg26 XMM9, DW_OP_piece 0x4, DW_OP_reg24 XMM7,
DW_OP_piece 0x4
# CHECK-EMPTY:
# CHECK: (lldb) image lookup -a 0x14000104f -v
# CHECK: LineEntry: [0x000000014000104e-0x0000000140001050):
C:\src\test\a.cpp:1004
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001011-0x0000000140001050), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "simple_type1", type =
"int64_t", valid ranges = <block>, location = [0x000000014000104f,
0x0000000140001050) -> DW_OP_reg26 XMM9, DW_OP_piece 0x4, DW_OP_piece 0x4
# CHECK-EMPTY:
diff --git a/lldb/test/Shell/SymbolFile/NativePDB/nested-blocks-same-address.s
b/lldb/test/Shell/SymbolFile/NativePDB/nested-blocks-same-address.s
index dc3ee844fe364..e51b280d4213e 100644
--- a/lldb/test/Shell/SymbolFile/NativePDB/nested-blocks-same-address.s
+++ b/lldb/test/Shell/SymbolFile/NativePDB/nested-blocks-same-address.s
@@ -30,6 +30,7 @@
# CHECK-NEXT: id = {{.*}}, range = [0x140001025-0x140001046)
# CHECK-NEXT: id = {{.*}}, range = [0x140001025-0x140001046)
# CHECK-NEXT: LineEntry: [0x0000000140001035-0x0000000140001046):
/tmp/test.cpp:10
+# CHECK-NEXT: Symbol: id = {{.*}}, range =
[0x0000000140001020-0x000000014000104d), name="main"
# CHECK-NEXT: Variable: id = {{.*}}, name = "path", type = "volatile
char[10]", valid ranges = <block>, location = [0x0000000140001025,
0x0000000140001046) -> DW_OP_breg7 RSP+40, decl =
# CHECK-NEXT: Variable: id = {{.*}}, name = "kMfDLL", type = "const char *",
valid ranges = <block>, location = [0x000000014000103c, 0x0000000140001046) ->
DW_OP_reg2 RCX, decl =
# CHECK-NEXT: Variable: id = {{.*}}, name = "__range1", type = "const char
*const (&)[1]", valid ranges = <block>, location = <empty>, decl =
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
