Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
9 changes: 6 additions & 3 deletions lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand 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;

Expand Down
39 changes: 39 additions & 0 deletions lldb/test/Shell/SymbolFile/PDB/add-symbols.cpp
Original file line number Diff line number Diff line change
@@ -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() {}
Loading