intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-21 12:19:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[LLDB][PDB] Access object file through module (#169728)

Browse Source 
When a PDB is loaded through `target symbols add <pdb-path>`, its
`m_objectfile_sp` is an `ObjectFilePDB` instead of `ObjectFilePECOFF`
(the debugged module). In both the native and DIA plugin, some paths
assumed that `m_objectfile_sp` is the debugged module. With this PR,
they go through `m_objfile_sp->GetModule()->GetObjectFile()`.

For the DIA plugin, this lead to an assertion failure
(https://github.com/llvm/llvm-project/issues/169628#issuecomment-3582555277)
and for both plugins, it meant that the symbol table wasn't loaded.
This commit is contained in:
nerix
2025-11-28 14:58:32 +01:00
committed by GitHub
parent 4237ec343a
commit cc72171322
3 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
View File

@@ -1126,7 +1126,8 @@ lldb::LanguageType SymbolFileNativePDB::ParseLanguage(CompileUnit &comp_unit) {
}
void SymbolFileNativePDB::AddSymbols(Symtab &symtab) {
auto *section_list = m_objfile_sp->GetSectionList();
auto *section_list =
m_objfile_sp->GetModule()->GetObjectFile()->GetSectionList();
if (!section_list)
return;

9
lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
View File

@@ -287,8 +287,10 @@ uint32_t SymbolFilePDB::CalculateAbilities() {
}
void SymbolFilePDB::InitializeObject() {
lldb::addr_t obj_load_address =
m_objfile_sp->GetBaseAddress().GetFileAddress();
lldb::addr_t obj_load_address = m_objfile_sp->GetModule()
->GetObjectFile()
->GetBaseAddress()
.GetFileAddress();
lldbassert(obj_load_address && obj_load_address != LLDB_INVALID_ADDRESS);
m_session_up->setLoadAddress(obj_load_address);
if (!m_global_scope_up)
@@ -1479,7 +1481,8 @@ void SymbolFilePDB::AddSymbols(lldb_private::Symtab &symtab) {
if (!results)
return;
auto section_list = m_objfile_sp->GetSectionList();
auto section_list =
m_objfile_sp->GetModule()->GetObjectFile()->GetSectionList();
if (!section_list)
return;

39
lldb/test/Shell/SymbolFile/PDB/add-symbols.cpp Normal file
View File

@@ -0,0 +1,39 @@
// REQUIRES: lld, target-windows
// Test that `target symbols add <pdb>` works.
// RUN: %build --compiler=clang-cl --nodefaultlib --output=%t.exe %s
// RUN: mv %t.pdb %t-renamed.pdb
// RUN: env LLDB_USE_NATIVE_PDB_READER=0 %lldb \
// RUN: -o "b main" \
// RUN: -o "target symbols add %t-renamed.pdb" \
// RUN: -o r \
// RUN: -o "target variable a" \
// RUN: -o "target modules dump symtab" \
// RUN: -b %t.exe | FileCheck %s
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb \
// RUN: -o "b main" \
// RUN: -o "target symbols add %t-renamed.pdb" \
// RUN: -o r \
// RUN: -o "target variable a" \
// RUN: -o "target modules dump symtab" \
// RUN: -b %t.exe | FileCheck %s
// CHECK: target create
// CHECK: (lldb) b main
// CHECK-NEXT: Breakpoint 1: no locations (pending).
// CHECK: (lldb) target symbols add
// CHECK: 1 location added to breakpoint 1
// CHECK: (lldb) r
// CHECK: * thread #1, stop reason = breakpoint 1.1
// CHECK: (lldb) target variable a
// CHECK-NEXT: (A) a = (x = 47)
// CHECK: (lldb) target modules dump symtab
// CHECK: [{{.*}} main
struct A {
int x = 47;
};
A a;
int main() {}