maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[LLDB][NativePDB] Fix image lookup by address 

`image lookup -a ` doesn't work because the compilands list is always empty.
Create CU at given index if doesn't exit.

Differential Revision: https://reviews.llvm.org/D113821
This commit is contained in:
Zequan Wu 2021-11-12 17:38:05 -08:00
parent 95edd7f53e
commit f17404a733
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -945,11 +945,11 @@ uint32_t SymbolFileNativePDB::ResolveSymbolContext(
llvm::Optional<uint16_t> modi = m_index->GetModuleIndexForVa(file_addr); llvm::Optional<uint16_t> modi = m_index->GetModuleIndexForVa(file_addr);
if (!modi) if (!modi)
return 0; return 0;
CompilandIndexItem *cci = m_index->compilands().GetCompiland(*modi); CompUnitSP cu_sp = GetCompileUnitAtIndex(modi.getValue());
if (!cci) if (!cu_sp)
return 0; return 0;
sc.comp_unit = GetOrCreateCompileUnit(*cci).get(); sc.comp_unit = cu_sp.get();
resolved_flags |= eSymbolContextCompUnit; resolved_flags |= eSymbolContextCompUnit;
} }

13
lldb/test/Shell/SymbolFile/NativePDB/lookup-by-address.cpp Normal file
View File

@ -0,0 +1,13 @@
// clang-format off
// REQUIRES: lld, x86
// RUN: %clang_cl --target=x86_64-windows-msvc -Od -Z7 -GR- -c /Fo%t.obj -- %s
// RUN: lld-link -debug:full -nodefaultlib -entry:main %t.obj -base:0x400000 -out:%t.exe -pdb:%t.pdb
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -O "target create %t.exe" -o "image lookup -a 0x401000" -o "exit" | FileCheck %s --check-prefix=ADDRESS
int main(int argc, char **argv) {
return 0;
}
// ADDRESS: image lookup -a 0x401000
// ADDRESS: Address: lookup-by-address.cpp.tmp.exe[0x{{0+}}401000] (lookup-by-address.cpp.tmp.exe..text
// ADDRESS: Summary: lookup-by-address.cpp.tmp.exe`main at lookup-by-address.cpp:7