[llvm-dwp] Report the filename if it cannot be found

[steven.zhang]

Summary

For now, we report nothing if the execution/dwo file is missing, which is confusing.

llvm-dwp -e a.out1 -o y
error: No such file or directory

With this patch, it looks like this:

llvm-dwp -e a.out1 -o y
error: 'a.out1': No such file or directory

[dblaikie]

Needs test cases (for all 3 code changes - so I'd expect three test cases (maybe in one file, if that's reasonable, doesn't have to be three separate test files necessarily))

[steven.zhang]

Add tests.

[dblaikie]

awesome - thanks!

[dyung]

@steven.zhang, the test you added seems to be failing on some Windows bots, can you take a look and revert if it will take a while to investigate?

https://lab.llvm.org/buildbot/#/builders/216/builds/9680
https://lab.llvm.org/buildbot/#/builders/123/builds/13130
https://lab.llvm.org/buildbot/#/builders/117/builds/9054

[thakis]

Reverted in df193a1a128d826be2d0d189c1c1fcfed20fd3d7 for now.

[dblaikie]

looks like all 3 linked failures were related to the case of the n in no such file or directory - some platforms use lowercase, some upper.

llvm/test/tools/llvm-dwp/X86/diagnose_missing_dwos.test

26–28

[steven.zhang]

llvm/test/tools/llvm-dwp/X86/diagnose_missing_dwos.test

26–28

Thanks ！

[steven.zhang]

I have re-commit as suggested. Thank you for pointing out the testing issue for windows.

llvm/lib/DWP/DWP.cpp

Error write(MCStreamer &Out, ArrayRef<std::string> Inputs) {
 
   SmallVector<OwningBinary<object::ObjectFile>, 128> Objects;
   Objects.reserve(Inputs.size());
 
   std::deque<SmallString<32>> UncompressedSections;
 
   for (const auto &Input : Inputs) {
     auto ErrOrObj = object::ObjectFile::createObjectFile(Input);
-    if (!ErrOrObj)
-      return ErrOrObj.takeError();
+    if (!ErrOrObj) {
+      return handleErrors(ErrOrObj.takeError(),
+                          [&](std::unique_ptr<ECError> EC) -> Error {
+                            return createFileError(Input, Error(std::move(EC)));
+                          });
+    }
 
     auto &Obj = *ErrOrObj->getBinary();
     Objects.push_back(std::move(*ErrOrObj));
 
     UnitIndexEntry CurEntry = {};
 
     StringRef CurStrSection;
     StringRef CurStrOffsetSection;

llvm/test/tools/llvm-dwp/X86/diagnose_missing_dwos.test

+RUN: rm -rf %t
+RUN: mkdir %t
+RUN: cd %t
+RUN: cp %p/../Inputs/dwos_list_from_exec/b.dwo b.dwo
+RUN: cp %p/../Inputs/dwos_list_from_exec/main main
+RUN: not llvm-dwp -e binary -o /dev/null 2>&1 | FileCheck %s --check-prefix=CHECK-BIN
+RUN: not llvm-dwp -e main -o /dev/null 2>&1 | FileCheck %s --check-prefix=CHECK-1ST-DWO
+RUN: cp %p/../Inputs/dwos_list_from_exec/a.dwo a.dwo
+RUN: rm b.dwo
+RUN: not llvm-dwp -e main -o /dev/null 2>&1 | FileCheck %s --check-prefix=CHECK-2ND-DWO
+
+Build commands for the test binaries:
+
+clang++ -Xclang -fdebug-compilation-dir -Xclang "./" -g -O0 -gsplit-dwarf a.cpp b.cpp -o main
+
+sources:
+a.cpp:
+  void a() {}
+
+b.cpp:
+  void b() {}
+  int main() {
+     return 0;
+  }
+
+CHECK-BIN: error: 'binary': No such file or directory
+CHECK-1ST-DWO: error: './a.dwo': No such file or directory
+CHECK-2ND-DWO: error: './b.dwo': No such file or directory

llvm/tools/llvm-dwp/llvm-dwp.cpp

int main(int argc, char **argv) {
   llvm::InitializeAllTargetMCs();
   llvm::InitializeAllTargets();
   llvm::InitializeAllAsmPrinters();
 
   std::vector<std::string> DWOFilenames = InputFiles;
   for (const auto &ExecFilename : ExecFilenames) {
     auto DWOs = getDWOFilenames(ExecFilename);
     if (!DWOs) {
-      logAllUnhandledErrors(DWOs.takeError(), WithColor::error());
+      logAllUnhandledErrors(
+          handleErrors(DWOs.takeError(),
+                       [&](std::unique_ptr<ECError> EC) -> Error {
+                         return createFileError(ExecFilename,
+                                                Error(std::move(EC)));
+                       }),
+          WithColor::error());
       return 1;
     }
     DWOFilenames.insert(DWOFilenames.end(),
                         std::make_move_iterator(DWOs->begin()),
                         std::make_move_iterator(DWOs->end()));
   }
 
   if (DWOFilenames.empty())
     return 0;
 
   std::string ErrorStr;
   StringRef Context = "dwarf streamer init";
 
   auto ErrOrTriple = readTargetTriple(DWOFilenames.front());
   if (!ErrOrTriple) {
-    logAllUnhandledErrors(ErrOrTriple.takeError(), WithColor::error());
+    logAllUnhandledErrors(
+        handleErrors(ErrOrTriple.takeError(),
+                     [&](std::unique_ptr<ECError> EC) -> Error {
+                       return createFileError(DWOFilenames.front(),
+                                              Error(std::move(EC)));
+                     }),
+        WithColor::error());
     return 1;
   }
 
   // Get the target.
   const Target *TheTarget =
       TargetRegistry::lookupTarget("", *ErrOrTriple, ErrorStr);
   if (!TheTarget)
     return error(ErrorStr, Context);