[PATCH] D68378: Revert r371729: lld-link: Make /linkrepro: take a filename, not a directory.

[Rui Ueyama via Phabricator via llvm-commits]

ruiu created this revision.
ruiu added a reviewer: thakis.
Herald added a project: LLVM.

This reverts commit r371729 because /linkrepro option also exists
in Microsoft link.exe and their linker takes not a filename but a
directory name as an argument for /linkrepro.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D68378

Files:
  lld/COFF/Driver.cpp
  lld/docs/ReleaseNotes.rst
  lld/test/COFF/linkrepro-res.test
  lld/test/COFF/linkrepro.test


Index: lld/test/COFF/linkrepro.test
===================================================================
--- lld/test/COFF/linkrepro.test
+++ lld/test/COFF/linkrepro.test
@@ -6,7 +6,7 @@
 
 # RUN: cd %t.dir/build1
 # RUN: lld-link %t.obj %p/Inputs/std32.lib /subsystem:console \
-# RUN:   /entry:main at 0 /linkrepro:repro.tar /out:%t.exe
+# RUN:   /entry:main at 0 /linkrepro:. /out:%t.exe
 # RUN: tar xf repro.tar
 # RUN: diff %t.obj repro/%:t.obj
 # RUN: diff %p/Inputs/std32.lib repro/%:p/Inputs/std32.lib
@@ -14,7 +14,7 @@
 
 # RUN: cd %t.dir/build2
 # RUN: lld-link %t.obj /libpath:%p/Inputs /defaultlib:std32 /subsystem:console \
-# RUN:   /entry:main at 0 /linkrepro:repro.tar /out:%t.exe
+# RUN:   /entry:main at 0 /linkrepro:. /out:%t.exe
 # RUN: tar xf repro.tar
 # RUN: diff %t.obj repro/%:t.obj
 # RUN: diff %p/Inputs/std32.lib repro/%:p/Inputs/std32.lib
@@ -22,7 +22,7 @@
 
 # RUN: cd %t.dir/build3
 # RUN: env LIB=%p/Inputs lld-link %t.obj /defaultlib:std32 /subsystem:console \
-# RUN:   /entry:main at 0 /linkrepro:repro.tar /out:%t.exe
+# RUN:   /entry:main at 0 /linkrepro:. /out:%t.exe
 # RUN: tar xf repro.tar
 # RUN: diff %t.obj repro/%:t.obj
 # RUN: diff %p/Inputs/std32.lib repro/%:p/Inputs/std32.lib
Index: lld/test/COFF/linkrepro-res.test
===================================================================
--- lld/test/COFF/linkrepro-res.test
+++ lld/test/COFF/linkrepro-res.test
@@ -4,7 +4,7 @@
 # RUN: mkdir -p %t.dir/build
 # RUN: cd %t.dir/build
 # RUN: lld-link %p/Inputs/resource.res /subsystem:console /machine:x64 \
-# RUN:   /entry:__ImageBase /linkrepro:repro.tar /out:%t.exe
+# RUN:   /entry:__ImageBase /linkrepro:. /out:%t.exe
 # RUN: tar xf repro.tar
 # RUN: diff %p/Inputs/resource.res repro/%:p/Inputs/resource.res
 # RUN: FileCheck %s --check-prefix=RSP < repro/response.txt
Index: lld/docs/ReleaseNotes.rst
===================================================================
--- lld/docs/ReleaseNotes.rst
+++ lld/docs/ReleaseNotes.rst
@@ -29,11 +29,6 @@
 COFF Improvements
 -----------------
 
-* /linkrepro: now takes the filename of the tar archive it writes, instead
-  of the name of a directory that a file called "repro.tar" is created in,
-  matching the behavior of ELF lld.
-* The new `/lldignoreenv` flag makes lld-link ignore environment variables
-  like `%LIB%`.
 * ...
 
 MinGW Improvements
Index: lld/COFF/Driver.cpp
===================================================================
--- lld/COFF/Driver.cpp
+++ lld/COFF/Driver.cpp
@@ -51,7 +51,7 @@
 using namespace llvm;
 using namespace llvm::object;
 using namespace llvm::COFF;
-using namespace llvm::sys;
+using llvm::sys::Process;
 
 namespace lld {
 namespace coff {
@@ -1134,15 +1134,17 @@
   config->mingw = args.hasArg(OPT_lldmingw);
 
   if (auto *arg = args.getLastArg(OPT_linkrepro)) {
-    const char *path = arg->getValue();
+    SmallString<64> path = StringRef(arg->getValue());
+    sys::path::append(path, "repro.tar");
 
     Expected<std::unique_ptr<TarWriter>> errOrWriter =
-        TarWriter::create(path, path::stem(path));
+        TarWriter::create(path, "repro");
+
     if (errOrWriter) {
       tar = std::move(*errOrWriter);
-      tar->append("version.txt", getLLDVersion() + "\n");
     } else {
-      error("/linkrepro: " + toString(errOrWriter.takeError()));
+      error("/linkrepro: failed to open " + path + ": " +
+            toString(errOrWriter.takeError()));
     }
   }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D68378.222978.patch
Type: text/x-patch
Size: 3410 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191003/1b777ff2/attachment.bin>