[llvm] r220004 - [llvm-symbolizer] Introduce the -dsym-hint option.
Kostya Serebryany
kcc at google.com
Wed Oct 22 12:17:35 PDT 2014
Alexander,
Have you seen the asan bootstrap failure?
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-bootstrap/builds/4853/steps/check-llvm%20asan/logs/stdio
==13115==ERROR: AddressSanitizer: stack-use-after-return on address
0x7fb5eea00ba8 at pc 0x0000004700f0 bp 0x7fff07b1f0d0 sp
0x7fff07b1e890
READ of size 16 at 0x7fb5eea00ba8 thread T0
#0 0x4700ef in memcmp
/home/dtoolsbot/build/sanitizer-x86_64-linux-bootstrap/build/llvm/projects/compiler-rt/lib/asan/asan_interceptors.cc:334
#1 0x4c5736 in darwinDsymMatchesBinary
/home/dtoolsbot/build/sanitizer-x86_64-linux-bootstrap/build/llvm/tools/llvm-symbolizer/LLVMSymbolize.cpp:310:11
#2 0x4c5736 in
llvm::symbolize::LLVMSymbolizer::lookUpDsymFile(std::string const&,
llvm::object::MachOObjectFile const*, std::string const&)
/home/dtoolsbot/build/sanitizer-x86_64-linux-bootstrap/build/llvm/tools/llvm-symbolizer/LLVMSymbolize.cpp:333
#3 0x4c9af3 in
llvm::symbolize::LLVMSymbolizer::getOrCreateObjects(std::string
const&, std::string const&)
/home/dtoolsbot/build/sanitizer-x86_64-linux-bootstrap/build/llvm/tools/llvm-symbolizer/LLVMSymbolize.cpp:361:16
#4 0x4c18af in
llvm::symbolize::LLVMSymbolizer::getOrCreateModuleInfo(std::string
const&) /home/dtoolsbot/build/sanitizer-x86_64-linux-bootstrap/build/llvm/tools/llvm-symbolizer/LLVMSymbolize.cpp:425:24
#5 0x4bfe4e in
llvm::symbolize::LLVMSymbolizer::symbolizeCode(std::string const&,
unsigned long) /home/dtoolsbot/build/sanitizer-x86_64-linux-bootstrap/build/llvm/tools/llvm-symbolizer/LLVMSymbolize.cpp:173:22
#6 0x4d7682 in main
/home/dtoolsbot/build/sanitizer-x86_64-linux-bootstrap/build/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp:144:18
#7 0x7fb5f1ac7ec4 in __libc_start_main
(/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
#8 0x4207e7 in _start
(/home/dtoolsbot/build/sanitizer-x86_64-linux-bootstrap/build/llvm_build_asan/bin/llvm-symbolizer+0x4207e7)
Address 0x7fb5eea00ba8 is located in stack of thread T0 at offset 40 in frame
#0 0x53700f in llvm::object::MachOObjectFile::getUuid() const
/home/dtoolsbot/build/sanitizer-x86_64-linux-bootstrap/build/llvm/lib/Object/MachOObjectFile.cpp:2424
This frame has 1 object(s):
[32, 56) 'Uuid' <== Memory access at offset 40 is inside this variable
On Thu, Oct 16, 2014 at 5:50 PM, Alexander Potapenko <glider at google.com>
wrote:
> Author: glider
> Date: Thu Oct 16 19:50:19 2014
> New Revision: 220004
>
> URL: http://llvm.org/viewvc/llvm-project?rev=220004&view=rev
> Log:
> [llvm-symbolizer] Introduce the -dsym-hint option.
>
> llvm-symbolizer will consult one of the .dSYM paths passed via -dsym-hint
> if it fails to find the .dSYM bundle at the default location.
>
> Added:
> llvm/trunk/test/tools/llvm-symbolizer/
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe (with
> props)
>
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-differentname.dSYM/
>
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-differentname.dSYM/Contents/
>
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-differentname.dSYM/Contents/Info.plist
> (with props)
>
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-differentname.dSYM/Contents/Resources/
>
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-differentname.dSYM/Contents/Resources/DWARF/
>
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-differentname.dSYM/Contents/Resources/DWARF/dsym-test-exe-second
> (with props)
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-second
> (with props)
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe.dSYM/
>
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe.dSYM/Contents/
>
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe.dSYM/Contents/Info.plist
> (with props)
>
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe.dSYM/Contents/Resources/
>
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe.dSYM/Contents/Resources/DWARF/
>
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe.dSYM/Contents/Resources/DWARF/dsym-test-exe
> (with props)
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test.c (with props)
> llvm/trunk/test/tools/llvm-symbolizer/dsym.test
> Modified:
> llvm/trunk/docs/CommandGuide/llvm-symbolizer.rst
> llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp
> llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.h
> llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp
>
> Modified: llvm/trunk/docs/CommandGuide/llvm-symbolizer.rst
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CommandGuide/llvm-symbolizer.rst?rev=220004&r1=220003&r2=220004&view=diff
>
> ==============================================================================
> --- llvm/trunk/docs/CommandGuide/llvm-symbolizer.rst (original)
> +++ llvm/trunk/docs/CommandGuide/llvm-symbolizer.rst Thu Oct 16 19:50:19
> 2014
> @@ -92,6 +92,13 @@ OPTIONS
> input (see example above). If architecture is not specified in either
> way,
> address will not be symbolized. Defaults to empty string.
>
> +.. option:: -dsym-hint=<path/to/file.dSYM>
> +
> + (Darwin-only flag). If the debug info for a binary isn't present in the
> default
> + location, look for the debug info at the .dSYM path provided via the
> + ``-dsym-hint`` flag. This flag can be used multiple times.
> +
> +
> EXIT STATUS
> -----------
>
>
> Added: llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe?rev=220004&view=auto
>
> ==============================================================================
> Binary file - no diff available.
>
> Propchange: llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe
>
> ------------------------------------------------------------------------------
> svn:executable = *
>
> Propchange: llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe
>
> ------------------------------------------------------------------------------
> svn:mime-type = application/octet-stream
>
> Added:
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-differentname.dSYM/Contents/Info.plist
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-differentname.dSYM/Contents/Info.plist?rev=220004&view=auto
>
> ==============================================================================
> Binary file - no diff available.
>
> Propchange:
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-differentname.dSYM/Contents/Info.plist
>
> ------------------------------------------------------------------------------
> svn:mime-type = application/xml
>
> Added:
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-differentname.dSYM/Contents/Resources/DWARF/dsym-test-exe-second
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-differentname.dSYM/Contents/Resources/DWARF/dsym-test-exe-second?rev=220004&view=auto
>
> ==============================================================================
> Binary file - no diff available.
>
> Propchange:
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-differentname.dSYM/Contents/Resources/DWARF/dsym-test-exe-second
>
> ------------------------------------------------------------------------------
> svn:mime-type = application/octet-stream
>
> Added: llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-second
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-second?rev=220004&view=auto
>
> ==============================================================================
> Binary file - no diff available.
>
> Propchange:
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-second
>
> ------------------------------------------------------------------------------
> svn:executable = *
>
> Propchange:
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe-second
>
> ------------------------------------------------------------------------------
> svn:mime-type = application/octet-stream
>
> Added:
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe.dSYM/Contents/Info.plist
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe.dSYM/Contents/Info.plist?rev=220004&view=auto
>
> ==============================================================================
> Binary file - no diff available.
>
> Propchange:
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe.dSYM/Contents/Info.plist
>
> ------------------------------------------------------------------------------
> svn:mime-type = application/xml
>
> Added:
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe.dSYM/Contents/Resources/DWARF/dsym-test-exe
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe.dSYM/Contents/Resources/DWARF/dsym-test-exe?rev=220004&view=auto
>
> ==============================================================================
> Binary file - no diff available.
>
> Propchange:
> llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test-exe.dSYM/Contents/Resources/DWARF/dsym-test-exe
>
> ------------------------------------------------------------------------------
> svn:mime-type = application/octet-stream
>
> Added: llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test.c
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test.c?rev=220004&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test.c (added)
> +++ llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test.c Thu Oct 16
> 19:50:19 2014
> @@ -0,0 +1,8 @@
> +// clang -c dsym-test.c -g
> +// clang dsym-test.o -g -o dsym-test-exe
> +// dsymutil dsym-test-exe
> +// clang dsym-test.o -g -o dsym-test-exe-second
> +// dsymutil dsym-test-exe-second -o dsym-test-exe-differentname.dSYM
> +int main() {
> + return 0;
> +}
>
> Propchange: llvm/trunk/test/tools/llvm-symbolizer/Inputs/dsym-test.c
>
> ------------------------------------------------------------------------------
> svn:eol-style = LF
>
> Added: llvm/trunk/test/tools/llvm-symbolizer/dsym.test
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/dsym.test?rev=220004&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/tools/llvm-symbolizer/dsym.test (added)
> +++ llvm/trunk/test/tools/llvm-symbolizer/dsym.test Thu Oct 16 19:50:19
> 2014
> @@ -0,0 +1,14 @@
> +RUN: echo "%p/Inputs/dsym-test-exe 0x0000000100000f90" > %t.input
> +RUN: echo "%p/Inputs/dsym-test-exe-second 0x0000000100000f90" >> %t.input
> +RUN: llvm-symbolizer < %t.input | FileCheck %s --check-prefix=CHECK-NOHINT
> +RUN: llvm-symbolizer
> -dsym-hint=%p/Inputs/dsym-test-exe-differentname.dSYM < %t.input |
> FileCheck %s --check-prefix=CHECK-HINT
> +
> +CHECK-NOHINT: main
> +CHECK-NOHINT: dsym-test.c
> +CHECK-NOHINT: main
> +CHECK-NOHINT: ??:0:0
> +
> +CHECK-HINT: main
> +CHECK-HINT: dsym-test.c
> +CHECK-HINT: main
> +CHECK-HINT: dsym-test.c
>
> Modified: llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp?rev=220004&r1=220003&r2=220004&view=diff
>
> ==============================================================================
> --- llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp (original)
> +++ llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp Thu Oct 16 19:50:19
> 2014
> @@ -207,14 +207,21 @@ std::string LLVMSymbolizer::symbolizeDat
>
> void LLVMSymbolizer::flush() {
> DeleteContainerSeconds(Modules);
> - BinaryForPath.clear();
> + ObjectPairForPathArch.clear();
> ObjectFileForArch.clear();
> }
>
> -static std::string getDarwinDWARFResourceForPath(const std::string &Path)
> {
> - StringRef Basename = sys::path::filename(Path);
> - const std::string &DSymDirectory = Path + ".dSYM";
> - SmallString<16> ResourceName = StringRef(DSymDirectory);
> +// For Path="/path/to/foo" and Basename="foo" assume that debug info is in
> +// /path/to/foo.dSYM/Contents/Resources/DWARF/foo.
> +// For Path="/path/to/bar.dSYM" and Basename="foo" assume that debug info
> is in
> +// /path/to/bar.dSYM/Contents/Resources/DWARF/foo.
> +static
> +std::string getDarwinDWARFResourceForPath(
> + const std::string &Path, const std::string &Basename) {
> + SmallString<16> ResourceName = StringRef(Path);
> + if (sys::path::extension(Path) != ".dSYM") {
> + ResourceName += ".dSYM";
> + }
> sys::path::append(ResourceName, "Contents", "Resources", "DWARF");
> sys::path::append(ResourceName, Basename);
> return ResourceName.str();
> @@ -265,9 +272,8 @@ static bool findDebugBinary(const std::s
> return false;
> }
>
> -static bool getGNUDebuglinkContents(const Binary *Bin, std::string
> &DebugName,
> +static bool getGNUDebuglinkContents(const ObjectFile *Obj, std::string
> &DebugName,
> uint32_t &CRCHash) {
> - const ObjectFile *Obj = dyn_cast<ObjectFile>(Bin);
> if (!Obj)
> return false;
> for (const SectionRef &Section : Obj->sections()) {
> @@ -294,57 +300,91 @@ static bool getGNUDebuglinkContents(cons
> return false;
> }
>
> -LLVMSymbolizer::BinaryPair
> -LLVMSymbolizer::getOrCreateBinary(const std::string &Path) {
> - const auto &I = BinaryForPath.find(Path);
> - if (I != BinaryForPath.end())
> +static
> +bool darwinDsymMatchesBinary(const MachOObjectFile *DbgObj,
> + const MachOObjectFile *Obj) {
> + ArrayRef<uint8_t> dbg_uuid = DbgObj->getUuid();
> + ArrayRef<uint8_t> bin_uuid = Obj->getUuid();
> + if (dbg_uuid.empty() || bin_uuid.empty())
> + return false;
> + return !memcmp(dbg_uuid.data(), bin_uuid.data(), dbg_uuid.size());
> +}
> +
> +ObjectFile *LLVMSymbolizer::lookUpDsymFile(const std::string &ExePath,
> + const MachOObjectFile *MachExeObj, const std::string &ArchName) {
> + // On Darwin we may find DWARF in separate object file in
> + // resource directory.
> + std::vector<std::string> DsymPaths;
> + StringRef Filename = sys::path::filename(ExePath);
> + DsymPaths.push_back(getDarwinDWARFResourceForPath(ExePath, Filename));
> + for (const auto &Path : Opts.DsymHints) {
> + DsymPaths.push_back(getDarwinDWARFResourceForPath(Path, Filename));
> + }
> + for (const auto &path : DsymPaths) {
> + ErrorOr<OwningBinary<Binary>> BinaryOrErr = createBinary(path);
> + std::error_code EC = BinaryOrErr.getError();
> + if (EC != errc::no_such_file_or_directory && !error(EC)) {
> + OwningBinary<Binary> B = std::move(BinaryOrErr.get());
> + ObjectFile *DbgObj =
> + getObjectFileFromBinary(B.getBinary().get(), ArchName);
> + const MachOObjectFile *MachDbgObj =
> + dyn_cast<const MachOObjectFile>(DbgObj);
> + if (!MachDbgObj) continue;
> + if (darwinDsymMatchesBinary(MachDbgObj, MachExeObj)) {
> + addOwningBinary(std::move(B));
> + return DbgObj;
> + }
> + }
> + }
> + return nullptr;
> +}
> +
> +LLVMSymbolizer::ObjectPair
> +LLVMSymbolizer::getOrCreateObjects(const std::string &Path,
> + const std::string &ArchName) {
> + const auto &I = ObjectPairForPathArch.find(std::make_pair(Path,
> ArchName));
> + if (I != ObjectPairForPathArch.end())
> return I->second;
> - Binary *Bin = nullptr;
> - Binary *DbgBin = nullptr;
> + ObjectFile *Obj = nullptr;
> + ObjectFile *DbgObj = nullptr;
> ErrorOr<OwningBinary<Binary>> BinaryOrErr = createBinary(Path);
> if (!error(BinaryOrErr.getError())) {
> - OwningBinary<Binary> &ParsedBinary = BinaryOrErr.get();
> - // Check if it's a universal binary.
> - Bin = ParsedBinary.getBinary().get();
> - addOwningBinary(std::move(ParsedBinary));
> - if (Bin->isMachO() || Bin->isMachOUniversalBinary()) {
> - // On Darwin we may find DWARF in separate object file in
> - // resource directory.
> - const std::string &ResourcePath =
> - getDarwinDWARFResourceForPath(Path);
> - BinaryOrErr = createBinary(ResourcePath);
> - std::error_code EC = BinaryOrErr.getError();
> - if (EC != errc::no_such_file_or_directory && !error(EC)) {
> - OwningBinary<Binary> B = std::move(BinaryOrErr.get());
> - DbgBin = B.getBinary().get();
> - addOwningBinary(std::move(B));
> - }
> + OwningBinary<Binary> &B = BinaryOrErr.get();
> + Obj = getObjectFileFromBinary(B.getBinary().get(), ArchName);
> + if (!Obj) {
> + ObjectPair Res = std::make_pair(nullptr, nullptr);
> + ObjectPairForPathArch[std::make_pair(Path, ArchName)] = Res;
> + return Res;
> }
> + addOwningBinary(std::move(B));
> + if (auto MachObj = dyn_cast<const MachOObjectFile>(Obj))
> + DbgObj = lookUpDsymFile(Path, MachObj, ArchName);
> // Try to locate the debug binary using .gnu_debuglink section.
> - if (!DbgBin) {
> + if (!DbgObj) {
> std::string DebuglinkName;
> uint32_t CRCHash;
> std::string DebugBinaryPath;
> - if (getGNUDebuglinkContents(Bin, DebuglinkName, CRCHash) &&
> + if (getGNUDebuglinkContents(Obj, DebuglinkName, CRCHash) &&
> findDebugBinary(Path, DebuglinkName, CRCHash, DebugBinaryPath))
> {
> BinaryOrErr = createBinary(DebugBinaryPath);
> if (!error(BinaryOrErr.getError())) {
> OwningBinary<Binary> B = std::move(BinaryOrErr.get());
> - DbgBin = B.getBinary().get();
> + DbgObj = getObjectFileFromBinary(B.getBinary().get(), ArchName);
> addOwningBinary(std::move(B));
> }
> }
> }
> }
> - if (!DbgBin)
> - DbgBin = Bin;
> - BinaryPair Res = std::make_pair(Bin, DbgBin);
> - BinaryForPath[Path] = Res;
> + if (!DbgObj)
> + DbgObj = Obj;
> + ObjectPair Res = std::make_pair(Obj, DbgObj);
> + ObjectPairForPathArch[std::make_pair(Path, ArchName)] = Res;
> return Res;
> }
>
> ObjectFile *
> -LLVMSymbolizer::getObjectFileFromBinary(Binary *Bin, const std::string
> &ArchName) {
> +LLVMSymbolizer::getObjectFileFromBinary(Binary *Bin,
> + const std::string &ArchName) {
> if (!Bin)
> return nullptr;
> ObjectFile *Res = nullptr;
> @@ -382,18 +422,16 @@ LLVMSymbolizer::getOrCreateModuleInfo(co
> ArchName = ArchStr;
> }
> }
> - BinaryPair Binaries = getOrCreateBinary(BinaryName);
> - ObjectFile *Obj = getObjectFileFromBinary(Binaries.first, ArchName);
> - ObjectFile *DbgObj = getObjectFileFromBinary(Binaries.second, ArchName);
> + ObjectPair Objects = getOrCreateObjects(BinaryName, ArchName);
>
> - if (!Obj) {
> + if (!Objects.first) {
> // Failed to find valid object file.
> Modules.insert(make_pair(ModuleName, (ModuleInfo *)nullptr));
> return nullptr;
> }
> - DIContext *Context = DIContext::getDWARFContext(*DbgObj);
> + DIContext *Context = DIContext::getDWARFContext(*Objects.second);
> assert(Context);
> - ModuleInfo *Info = new ModuleInfo(Obj, Context);
> + ModuleInfo *Info = new ModuleInfo(Objects.first, Context);
> Modules.insert(make_pair(ModuleName, Info));
> return Info;
> }
>
> Modified: llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.h?rev=220004&r1=220003&r2=220004&view=diff
>
> ==============================================================================
> --- llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.h (original)
> +++ llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.h Thu Oct 16 19:50:19
> 2014
> @@ -39,13 +39,14 @@ public:
> bool PrintInlining : 1;
> bool Demangle : 1;
> std::string DefaultArch;
> + std::vector<std::string> DsymHints;
> Options(bool UseSymbolTable = true,
> FunctionNameKind PrintFunctions =
> FunctionNameKind::LinkageName,
> bool PrintInlining = true, bool Demangle = true,
> std::string DefaultArch = "")
> - : UseSymbolTable(UseSymbolTable), PrintFunctions(PrintFunctions),
> - PrintInlining(PrintInlining), Demangle(Demangle),
> - DefaultArch(DefaultArch) {}
> + : UseSymbolTable(UseSymbolTable),
> + PrintFunctions(PrintFunctions), PrintInlining(PrintInlining),
> + Demangle(Demangle), DefaultArch(DefaultArch) {}
> };
>
> LLVMSymbolizer(const Options &Opts = Options()) : Opts(Opts) {}
> @@ -62,11 +63,15 @@ public:
> void flush();
> static std::string DemangleName(const std::string &Name);
> private:
> - typedef std::pair<Binary*, Binary*> BinaryPair;
> + typedef std::pair<ObjectFile*, ObjectFile*> ObjectPair;
>
> ModuleInfo *getOrCreateModuleInfo(const std::string &ModuleName);
> - /// \brief Returns pair of pointers to binary and debug binary.
> - BinaryPair getOrCreateBinary(const std::string &Path);
> + ObjectFile *lookUpDsymFile(const std::string &Path, const
> MachOObjectFile *ExeObj,
> + const std::string &ArchName);
> +
> + /// \brief Returns pair of pointers to object and debug object.
> + ObjectPair getOrCreateObjects(const std::string &Path,
> + const std::string &ArchName);
> /// \brief Returns a parsed object file for a given architecture in a
> /// universal binary (or the binary itself if it is an object file).
> ObjectFile *getObjectFileFromBinary(Binary *Bin, const std::string
> &ArchName);
> @@ -83,9 +88,10 @@ private:
>
> // Owns module info objects.
> std::map<std::string, ModuleInfo *> Modules;
> - std::map<std::string, BinaryPair> BinaryForPath;
> std::map<std::pair<MachOUniversalBinary *, std::string>, ObjectFile *>
> ObjectFileForArch;
> + std::map<std::pair<std::string, std::string>, ObjectPair>
> + ObjectPairForPathArch;
>
> Options Opts;
> static const char kBadString[];
>
> Modified: llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp?rev=220004&r1=220003&r2=220004&view=diff
>
> ==============================================================================
> --- llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp (original)
> +++ llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp Thu Oct 16
> 19:50:19 2014
> @@ -19,6 +19,7 @@
> #include "llvm/ADT/StringRef.h"
> #include "llvm/Support/CommandLine.h"
> #include "llvm/Support/Debug.h"
> +#include "llvm/Support/FileSystem.h"
> #include "llvm/Support/ManagedStatic.h"
> #include "llvm/Support/PrettyStackTrace.h"
> #include "llvm/Support/Signals.h"
> @@ -61,6 +62,11 @@ ClBinaryName("obj", cl::init(""),
> cl::desc("Path to object file to be symbolized (if not
> provided, "
> "object file should be specified for each input
> line)"));
>
> +static cl::list<std::string>
> +ClDsymHint("dsym-hint", cl::ZeroOrMore,
> + cl::desc("Path to .dSYM bundles to search for debug info for
> the "
> + "object files"));
> +
> static bool parseCommand(bool &IsData, std::string &ModuleName,
> uint64_t &ModuleOffset) {
> const char *kDataCmd = "DATA ";
> @@ -119,6 +125,14 @@ int main(int argc, char **argv) {
> cl::ParseCommandLineOptions(argc, argv, "llvm-symbolizer\n");
> LLVMSymbolizer::Options Opts(ClUseSymbolTable, ClPrintFunctions,
> ClPrintInlining, ClDemangle,
> ClDefaultArch);
> + for (const auto &hint : ClDsymHint) {
> + if (sys::path::extension(hint) == ".dSYM") {
> + Opts.DsymHints.push_back(hint);
> + } else {
> + errs() << "Warning: invalid dSYM hint: \"" << hint <<
> + "\" (must have the '.dSYM' extension).\n";
> + }
> + }
> LLVMSymbolizer Symbolizer(Opts);
>
> bool IsData = false;
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20141022/b5046370/attachment.html>
More information about the llvm-commits
mailing list