caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Debuginfod] Add --debug-file-directory to llvm-debuginfod-find.

Browse Source 
This allows llvm-debuginfod-find to locate binaries in local build ID
directories configured via --debug-file-directory, the same flag used
for this purpose by llvm-symbolizer. This provides a consistent lookup
semantics between the two tools when configured the same way, in
particular when debug binaries may be located either locally or
remotely.

Reviewed By: phosek

Differential Revision: https://reviews.llvm.org/D125864
This commit is contained in:
Daniel Thornburgh
2022-05-17 14:29:27 +00:00
parent 47b8424a53
commit eafa053041
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/test/tools/llvm-debuginfod-find/local.test Normal file
View File

@@ -0,0 +1,18 @@
# Test that llvm-debuginfod-find can perform local directory lookups.
# Test depends on POSIX file paths.
UNSUPPORTED: system-windows
RUN: mkdir -p %t/a/.build-id
RUN: mkdir -p %t/b/.build-id/00/00000000000000
RUN: mkdir -p %t/b/.build-id/01/23456789012345.debug
RUN: mkdir -p %t/b/.build-id/02/22222222222222
RUN: mkdir -p %t/c/.build-id/
RUN: llvm-debuginfod-find \
RUN: --debug-file-directory %t/a \
RUN: --debug-file-directory %t/b \
RUN: --debug-file-directory %t/c \
RUN: --debuginfo 0123456789012345 > %t.out
RUN: FileCheck -DT=%t --match-full-lines --implicit-check-not {{.}} %s < %t.out
CHECK: [[T]]/b/.build-id/01/23456789012345.debug

20
llvm/tools/llvm-debuginfod-find/llvm-debuginfod-find.cpp
View File

@@ -15,6 +15,7 @@
///
//===----------------------------------------------------------------------===//
#include "llvm/DebugInfo/Symbolize/DIFetcher.h"
#include "llvm/Debuginfod/Debuginfod.h"
#include "llvm/Debuginfod/HTTPClient.h"
#include "llvm/Support/CommandLine.h"
@@ -53,6 +54,11 @@ static cl::opt<bool>
"path to the cached artifact on disk."),
cl::cat(DebuginfodFindCategory));
static cl::list<std::string> DebugFileDirectory(
"debug-file-directory",
cl::desc("Path to directory where to look for debug files."),
cl::cat(DebuginfodFindCategory));
[[noreturn]] static void helpExit() {
errs() << "Must specify exactly one of --executable, "
"--source=/path/to/file, or --debuginfo.";
@@ -61,6 +67,8 @@ static cl::opt<bool>
ExitOnError ExitOnErr;
static std::string fetchDebugInfo(ArrayRef<uint8_t> BuildID);
int main(int argc, char **argv) {
InitLLVM X(argc, argv);
HTTPClient::initialize();
@@ -92,7 +100,7 @@ int main(int argc, char **argv) {
else if (FetchExecutable)
Path = ExitOnErr(getCachedOrDownloadExecutable(ID));
else if (FetchDebuginfo)
Path = ExitOnErr(getCachedOrDownloadDebuginfo(ID));
Path = fetchDebugInfo(ID);
else
llvm_unreachable("We have already checked that exactly one of the above "
"conditions is true.");
@@ -107,3 +115,13 @@ int main(int argc, char **argv) {
// Print the path to the cached artifact file.
outs() << Path << "\n";
}
// Find a debug binary in local build ID directories and via debuginfod.
std::string fetchDebugInfo(ArrayRef<uint8_t> BuildID) {
if (!DebugFileDirectory.empty()) {
symbolize::LocalDIFetcher Fetcher(DebugFileDirectory);
if (Optional<std::string> LocalPath = Fetcher.fetchBuildID(BuildID))
return *LocalPath;
}
return ExitOnErr(getCachedOrDownloadDebuginfo(BuildID));
}