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

Recommit "[llvm-symbolizer] Switch to using native symbolizer by default on Windows" 

This reverts commit 1b63177a56.
This commit is contained in:
Amy Huang 2020-11-30 14:35:15 -08:00
parent 4d7f3d68f1
commit efd1ec0dec
8 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/test/COFF/symbolizer-inline.s
View File

@ -1,7 +1,7 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj %s -o %t.obj -triple x86_64-windows-msvc
# RUN: lld-link -entry:main -nodefaultlib %t.obj -out:%t.exe -pdb:%t.pdb -debug
# RUN: llvm-symbolizer --obj=%t.exe --use-native-pdb-reader --relative-address \
# RUN: llvm-symbolizer --obj=%t.exe --relative-address \
# RUN: 0x1014 0x1018 0x101c 0x1023 0x1024 \
# RUN: 0x1037 0x103A 0x104B 0x104E | FileCheck %s

8
llvm/docs/CommandGuide/llvm-symbolizer.rst
View File

@ -354,6 +354,14 @@ OPTIONS
Read command-line options from response file `<FILE>`.
WINDOWS/PDB SPECIFIC OPTIONS
-----------------------------
.. option:: --dia
Use the Windows DIA SDK for symbolization. If the DIA SDK is not found,
llvm-symbolizer will fall back to the native implementation.
MACH-O SPECIFIC OPTIONS
-----------------------

2
llvm/include/llvm/DebugInfo/Symbolize/Symbolize.h
View File

@ -43,7 +43,7 @@ public:
bool Demangle = true;
bool RelativeAddresses = false;
bool UntagAddresses = false;
bool UseNativePDBReader = false;
bool UseDIA = false;
std::string DefaultArch;
std::vector<std::string> DsymHints;
std::string FallbackDebugPath;

7
llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
View File

@ -557,11 +557,8 @@ LLVMSymbolizer::getOrCreateModuleInfo(const std::string &ModuleName) {
using namespace pdb;
std::unique_ptr<IPDBSession> Session;
PDB_ReaderType ReaderType = PDB_ReaderType::Native;
#if LLVM_ENABLE_DIA_SDK
if (!Opts.UseNativePDBReader)
ReaderType = PDB_ReaderType::DIA;
#endif
PDB_ReaderType ReaderType =
Opts.UseDIA ? PDB_ReaderType::DIA : PDB_ReaderType::Native;
if (auto Err = loadDataForEXE(ReaderType, Objects.first->getFileName(),
Session)) {
Modules.emplace(ModuleName, std::unique_ptr<SymbolizableModule>());

2
llvm/test/tools/llvm-symbolizer/pdb/pdb-columns.test
View File

@ -8,8 +8,6 @@ RUN: echo 0x140006C40 >> %t.input
RUN: echo 0x140006C70 >> %t.input
RUN: llvm-symbolizer -obj="%p/Inputs/test-columns.exe" < %t.input \
RUN: | FileCheck %s
RUN: llvm-symbolizer -obj="%p/Inputs/test-columns.exe" -use-native-pdb-reader < %t.input \
RUN: | FileCheck %s
This tests that the symbolizer outputs column info when it is present in the pdb.

13
llvm/test/tools/llvm-symbolizer/pdb/pdb.test
View File

@ -6,17 +6,18 @@ RUN: echo 0x4013D0 >> %t.input
RUN: echo 0x4013E0 >> %t.input
RUN: echo 0x4013F0 >> %t.input
RUN: echo 0x401420 >> %t.input
RUN: llvm-symbolizer -obj="%p/Inputs/test.exe" < %t.input \
RUN: llvm-symbolizer --obj="%p/Inputs/test.exe" < %t.input \
RUN: | FileCheck %s
RUN: llvm-symbolizer --obj="%p/Inputs/test.exe" --no-demangle < %t.input \
RUN: | FileCheck %s --check-prefix=CHECK-NO-DEMANGLE
Test with native pdb reader.
RUN: llvm-symbolizer -use-native-pdb-reader -obj="%p/Inputs/test.exe" < %t.input \
; Check that -dia works
RUN: llvm-symbolizer --dia --obj="%p/Inputs/test.exe" < %t.input \
RUN: | FileCheck %s
RUN: llvm-symbolizer --use-native-pdb-reader --obj="%p/Inputs/test.exe" --no-demangle < %t.input \
RUN: llvm-symbolizer --dia --obj="%p/Inputs/test.exe" --no-demangle < %t.input \
RUN: | FileCheck %s --check-prefix=CHECK-NO-DEMANGLE
Subtract ImageBase from all the offsets and run the test again with
--relative-address.
@ -24,10 +25,6 @@ RUN: %python -c 'import sys;print("\n".join([hex(int(x, 16) - 0x400000) for x in
RUN: | llvm-symbolizer --obj="%p/Inputs/test.exe" --no-demangle --relative-address \
RUN: | FileCheck %s --check-prefix=CHECK-NO-DEMANGLE
RUN: %python -c 'import sys;print("\n".join([hex(int(x, 16) - 0x400000) for x in sys.stdin]))' < %t.input \
RUN: | llvm-symbolizer --use-native-pdb-reader --obj="%p/Inputs/test.exe" --no-demangle --relative-address \
RUN: | FileCheck %s --check-prefix=CHECK-NO-DEMANGLE
CHECK: foo(void)
CHECK-NEXT: test.cpp:10
CHECK: {{^private_symbol$}}

2
llvm/tools/llvm-symbolizer/Opts.td
View File

@ -41,7 +41,7 @@ defm print_source_context_lines : Eq<"print-source-context-lines", "Print N line
def relative_address : F<"relative-address", "Interpret addresses as addresses relative to the image base">;
def relativenames : F<"relativenames", "Strip the compilation directory from paths">;
defm untag_addresses : B<"untag-addresses", "", "Remove memory tags from addresses before symbolization">;
def use_native_pdb_reader : F<"use-native-pdb-reader", "Use native PDB functionality">;
def use_dia: F<"dia", "Use the DIA library to access symbols (Windows only)">;
def verbose : F<"verbose", "Print verbose line info">;
def version : F<"version", "Display the version">;

8
llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp
View File

@ -288,7 +288,13 @@ int main(int argc, char **argv) {
Opts.RelativeAddresses = Args.hasArg(OPT_relative_address);
Opts.UntagAddresses =
Args.hasFlag(OPT_untag_addresses, OPT_no_untag_addresses, !IsAddr2Line);
Opts.UseNativePDBReader = Args.hasArg(OPT_use_native_pdb_reader);
Opts.UseDIA = Args.hasArg(OPT_use_dia);
#if !defined(LLVM_ENABLE_DIA_SDK)
if (Opts.UseDIA) {
WithColor::warning() << "DIA not available; using native PDB reader\n";
Opts.UseDIA = false;
}
#endif
Opts.UseSymbolTable = true;
for (const opt::Arg *A : Args.filtered(OPT_dsym_hint_EQ)) {