Create version.txt in a reproduce archive file.

[ruiu]

Summary

Create version.txt in a reproduce archive file.

[• rafael]

Lgtm. Thanks!

ELF/Driver.h

private:
   CpioFile(std::unique_ptr<llvm::raw_fd_ostream> OS, StringRef Basename);
 
   std::unique_ptr<llvm::raw_fd_ostream> OS;
   llvm::StringSet<> Seen;
   std::string Basename;
 };
 
 void printHelp(const char *Argv0);
-void printVersion();
+std::string getVersionString();
 std::vector<uint8_t> parseHexstring(StringRef S);
 
 std::string createResponseFile(const llvm::opt::InputArgList &Args);
 std::string relativeToRoot(StringRef Path);
 
 std::string findFromSearchPaths(StringRef Path);
 std::string searchLibrary(StringRef Path);
 std::string buildSysrootedPath(llvm::StringRef Dir, llvm::StringRef File);
 
 } // namespace elf
 } // namespace lld
 
 #endif

ELF/Driver.cpp

 void LinkerDriver::main(ArrayRef<const char *> ArgsArr) {
   ELFOptTable Parser;
   opt::InputArgList Args = Parser.parse(ArgsArr.slice(1));
   if (Args.hasArg(OPT_help)) {
     printHelp(ArgsArr[0]);
     return;
   }
   if (Args.hasArg(OPT_version)) {
-    printVersion();
+    outs() << getVersionString();
     return;
   }
 
   if (auto *Arg = Args.getLastArg(OPT_reproduce)) {
     // Note that --reproduce is a debug option so you can ignore it
     // if you are trying to understand the whole picture of the code.
     Cpio.reset(CpioFile::create(Arg->getValue()));
-    if (Cpio)
+    if (Cpio) {
       Cpio->append("response.txt", createResponseFile(Args));
+      Cpio->append("version.txt", getVersionString());
+    }
   }
 
   readConfigs(Args);
   initLLVM(Args);
   createFiles(Args);
   checkOptions(Args);
   if (HasError)
     return;

ELF/DriverUtils.cpp

opt::InputArgList ELFOptTable::parse(ArrayRef<const char *> Argv) {
   return Args;
 }
 
 void elf::printHelp(const char *Argv0) {
   ELFOptTable Table;
   Table.PrintHelp(outs(), Argv0, "lld", false);
 }
 
-void elf::printVersion() {
-  outs() << "LLD " << getLLDVersion();
-  std::string S = getLLDRepositoryVersion();
-  if (!S.empty())
-    outs() << " " << S;
-  outs() << "\n";
+std::string elf::getVersionString() {
+  std::string Version = getLLDVersion();
+  std::string Repo = getLLDRepositoryVersion();
+  if (Repo.empty())
+    return "LLD " + Version + "\n";
+  return "LLD " + Version + " " + Repo + "\n";
 }
 
 // Converts a hex string (e.g. "0x123456") to a vector.
 std::vector<uint8_t> elf::parseHexstring(StringRef S) {
   if (S.find_first_not_of("0123456789abcdefABCDEF") != StringRef::npos ||
       S.size() % 2) {
     error("malformed hexstring: " + S);
     return {};

test/ELF/reproduce.s

 # RUN: FileCheck %s --check-prefix=RSP < repro/response.txt
 # RSP: {{^}}--hash-style gnu{{$}}
 # RSP-NOT: repro{{[/\\]}}
 # RSP-NEXT: {{[/\\]}}foo.o
 # RSP-NEXT: -o bar
 # RSP-NEXT: -shared
 # RSP-NEXT: --as-needed
 
+# RUN: FileCheck %s --check-prefix=VERSION < repro/version.txt
+# VERSION: LLD
+
 # RUN: mkdir -p %t.dir/build2/a/b/c
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.dir/build2/foo.o
 # RUN: cd %t.dir/build2/a/b/c
 # RUN: ld.lld ./../../../foo.o -o bar -shared --as-needed --reproduce repro
 # RUN: cpio -id < repro.cpio
 # RUN: diff %t.dir/build2/foo.o repro/%:t.dir/build2/foo.o
 
 # RUN: echo "{ local: *; };" >  ver

 # RSP2-NEXT: --script {{.+}}file
 # RSP2-NEXT: --version-script [[PATH:.*]]ver
 # RSP2-NEXT: --dynamic-linker "some unusual/path"
 # RSP2-NEXT: -soname="foo bar"
 # RSP2-NEXT: -soname="foo bar"
 
 # RUN: cpio -t < repro2.cpio | FileCheck %s
 # CHECK:      repro2/response.txt
+# CHECK-NEXT: repro2/version.txt
 # CHECK-NEXT: repro2/{{.*}}/dyn
 # CHECK-NEXT: repro2/{{.*}}/ver
 # CHECK-NEXT: repro2/{{.*}}/foo bar
 # CHECK-NEXT: repro2/{{.*}}/file2
 # CHECK-NEXT: repro2/{{.*}}/file
 
 .globl _start
 _start:
   mov $60, %rax
   mov $42, %rdi
   syscall