[clang][Driver] Pass correct reproduce flag to lld-link

[abrachet]

Summary

Additionally, the explicit linux target has been removed from the test.

[thakis]

clang/lib/Driver/Driver.cpp

1635

@mstorsjo, will this do the right thing for mingw?

[mstorsjo]

clang/lib/Driver/Driver.cpp

1635

The correct thing for the mingw linker interface would be to do the same thing as for GNU style linkers, i.e. using the unix parameter form.

(With the lld mingw interface, the canonical way to pass options through to the underlying lld-link interface is e.g. -Xlink=/reproduce:. But as an unintended loophole, as long as you pass lld-link options with a leading slash instead of a dash, e.g. if you pass e.g. /reproduce: directly to the mingw interface, the mingw interface considers it a filename and passes it through as-is to lld-link, and lld-link the interprets it as an option. But that's not the kosher way to do it IMO.)

Thus, here, I think the correct thing would be to check C.getDefaultToolChain().getTriple().isWindowsMSVCEnvironment().

[abrachet]

clang/lib/Driver/Driver.cpp

1635

Thanks

[thakis]

Thanks! LG with comment.

clang/lib/Driver/Driver.cpp

1634–1638

Twines shouldn't be on the stack. There's no reason for this to be a Twine either -- make it a StringRef (and then cast below if needed)

[thakis]

The removal of the explicit target broke the test on Mac: http://45.33.8.238/macm1/42754/step_7.txt

(Just need to be more permissive about leading underscores)

Please take a look and revert for now if it takes a while to fix.

[abrachet]

In D131214#3733317, @thakis wrote:

The removal of the explicit target broke the test on Mac: http://45.33.8.238/macm1/42754/step_7.txt

(Just need to be more permissive about leading underscores)

Please take a look and revert for now if it takes a while to fix.

Thanks should be fixed by https://github.com/llvm/llvm-project/commit/c175d80be2ed496debb98d47f315aa5e60116768

clang/lib/Driver/Driver.cpp

if (!FailingCommands.empty()) {
     return;
   }
 
   // If lld failed, rerun it again with --reproduce.
   if (IsLLD) {
     const char *TmpName = CreateTempFile(C, "linker-crash", "tar");
     Command NewLLDInvocation = Cmd;
     llvm::opt::ArgStringList ArgList = NewLLDInvocation.getArguments();
-    ArgList.push_back(Saver.save(Twine{"--reproduce="} + TmpName).data());
+    StringRef ReproduceOption =
+        C.getDefaultToolChain().getTriple().isWindowsMSVCEnvironment()
+            ? "/reproduce:"
+            : "--reproduce=";
+    ArgList.push_back(Saver.save(Twine(ReproduceOption) + TmpName).data());
     NewLLDInvocation.replaceArguments(std::move(ArgList));
 
     // Redirect stdout/stderr to /dev/null.
     NewLLDInvocation.Execute({None, {""}, {""}}, nullptr, nullptr);
   }
 
   const ArgStringList &TempFiles = C.getTempFiles();
   if (TempFiles.empty()) {

clang/test/Driver/lld-repro.c

-// REQUIRES: lld, x86-registered-target
+// REQUIRES: lld
+// UNSUPPORTED: ps4
 
-// RUN: not %clang %s -target x86_64-linux -nostartfiles -nostdlib -fuse-ld=lld -gen-reproducer=error -fcrash-diagnostics-dir=%t -fcrash-diagnostics=all 2>&1 \
+// RUN: not %clang %s -nostartfiles -nostdlib -fuse-ld=lld -gen-reproducer=error -fcrash-diagnostics-dir=%t -fcrash-diagnostics=all 2>&1 \
 // RUN:   | FileCheck %s
 
 // check that we still get lld's output
 // CHECK: error: undefined symbol: a
 
 // CHECK: Preprocessed source(s) and associated run script(s) are located at:
 // CHECK-NEXT: note: diagnostic msg: {{.*}}lld-repro-{{.*}}.c
 // CHECK-NEXT: note: diagnostic msg: {{.*}}linker-crash-{{.*}}.tar
 // CHECK-NEXT: note: diagnostic msg: {{.*}}lld-repro-{{.*}}.sh
 // CHECK-NEXT: note: diagnostic msg:
 // CHECK: ********************
 
-// RUN: not %clang %s -target x86_64-linux -nostartfiles -nostdlib -fuse-ld=lld -gen-reproducer=error -fcrash-diagnostics-dir=%t -fcrash-diagnostics=compiler 2>&1 \
+// RUN: not %clang %s -nostartfiles -nostdlib -fuse-ld=lld -gen-reproducer=error -fcrash-diagnostics-dir=%t -fcrash-diagnostics=compiler 2>&1 \
 // RUN:   | FileCheck %s --check-prefix=NO-LINKER
-// RUN: not %clang %s -target x86_64-linux -nostartfiles -nostdlib -fuse-ld=lld -gen-reproducer=error -fcrash-diagnostics-dir=%t 2>&1 \
+// RUN: not %clang %s -nostartfiles -nostdlib -fuse-ld=lld -gen-reproducer=error -fcrash-diagnostics-dir=%t 2>&1 \
 // RUN:   | FileCheck %s --check-prefix=NO-LINKER
 
 // NO-LINKER-NOT: Preprocessed source(s) and associated run script(s) are located at:
 
 extern int a;
 int main() {
   return a;
 }