Strip file path from the -o option while creating reproduce.txt

[dmikulin]

Summary

This is a fix for Bugzilla 28579.
The problem is that in --reproduce links the file path in -o option is copied verbatim. When "lld @response.txt" link is run against the extracted test case, if -o contains anything other that a plain file name, the link will likely fail because the target directory in -o may not exists. Stripping the directory path will create the output file in the top level test directory.

[davide]

Please upload this patch with context git diff -U9999999 (or the equivalent svn command).

[davide]

I think this is the right direction. The alternative would be to create the intermediate directories in the archive we're building, but that seems more complicated for pretty much no additional benefit.
Rui, what do you think? Also, make sure this works on Windows (it should just fine, but better making sure to avoid failures on the bots).

[dmikulin]

Minor formatting change.

[ruiu]

This bit me a few times, so I think this is a good addition. Thank you for doing this!

ELF/DriverUtils.cpp

139

Since we know it is "-o", OS << "-o " << is more straightforward.

Please add a comment why you are stripping directory parts from a path.

// If an output path contains directories, "lld @response.txt" will likely
// to fail because the archive we are creating doesn't contain empty
// directories for the output path (-o doesn't create directories).
// Strip directories to prevent the issue.

[dmikulin]

Added a comment and changed the output to explicit "-o "

[ruiu]

LGTM

[davide]

LGTM.

[silvas]

Thanks for working on this!

[• rafael]

Committed as r293792

ELF/DriverUtils.cpp

     case OPT_INPUT:
       OS << quote(rewritePath(Arg->getValue())) << "\n";
       break;
+    case OPT_o:
+      OS << Arg->getSpelling() << " " <<
+        quote(sys::path::filename(Arg->getValue()))
+        << "\n";
+      break;
     case OPT_L:
     case OPT_dynamic_list:
     case OPT_rpath:

test/ELF/reproduce.s

 # CHECK-NEXT: repro2/{{.*}}/file2
 # CHECK-NEXT: repro2/{{.*}}/file
 
+## Check that directory path is stripped from -o <file-path>
+# RUN: mkdir -p %t.dir/build3/a/b/c
+# RUN: cd %t.dir
+# RUN: ld.lld build1/foo.o -o build3/a/b/c/bar -shared --as-needed --reproduce repro3.tar
+# RUN: tar xf repro3.tar
+# RUN: FileCheck %s --check-prefix=RSP3 < repro3/response.txt
+# RSP3: -o bar
+
 .globl _start
 _start:
   mov $60, %rax