[clang] Put original flags on 'Driver args:' crash report line

[thakis]

Summary

We used to put the canonical spelling of flags after alias processing
on that line. For clang-cl in particular, that meant that we put flags
on that line that the clang-cl driver doesn't even accept, and the
"Driver args:" line wasn't usable.

[hans]

lgtm

clang/lib/Driver/Driver.cpp

1220

Could put a comment here about why it's calling getAlias() (Or maybe it's just me that finds the getAlias() name confusing.)

clang/test/Driver/crash-report-clang-cl.c

3

These always make me thing the test should "requires: shell", but I think for these commands it should work without, right?

[thakis]

Thanks!

clang/test/Driver/crash-report-clang-cl.c

3

Yes, these work without REQUIRES: shell. We require a whole bunch of unix utils on Windows, but we don't require a shell for most tests. That's usually required if doing advanced piping maybe? Actually, looking at REQUIRES: shell in tests, many put it there needlessly :/

[thakis]

add comment

clang/lib/Driver/Driver.cpp

 
   BuildJobs(*C);
 
   return C;
 }
 
 static void printArgList(raw_ostream &OS, const llvm::opt::ArgList &Args) {
   llvm::opt::ArgStringList ASL;
-  for (const auto *A : Args)
+  for (const auto *A : Args) {
+    // Use user's original spelling of flags. For example, use
+    // `/source-charset:utf-8` instead of `-finput-charset=utf-8` if the user
+    // wrote the former.
+    while (A->getAlias())
+      A = A->getAlias();
     A->render(Args, ASL);
+  }
 
   for (auto I = ASL.begin(), E = ASL.end(); I != E; ++I) {
     if (I != ASL.begin())
       OS << ' ';
     llvm::sys::printArg(OS, *I, true);
   }
   OS << '\n';
 }

clang/test/Driver/crash-report-clang-cl.c

+// RUN: rm -rf %t
+// RUN: mkdir %t
+
+// RUN: env TMPDIR=%t TEMP=%t TMP=%t RC_DEBUG_OPTIONS=1           \
+// RUN: not %clang_cl -fsyntax-only /Brepro /source-charset:utf-8 \
+// RUN:     -- %s 2>&1 | FileCheck %s
+// RUN: cat %t/crash-report-*.sh | FileCheck --check-prefix=CHECKSH %s
+
+// REQUIRES: crash-recovery
+
+#pragma clang __debug crash
+
+// CHECK: Preprocessed source(s) and associated run script(s) are located at:
+// CHECK-NEXT: note: diagnostic msg: {{.*}}crash-report-clang-cl-{{.*}}.c
+// CHECKSH: # Crash reproducer
+// CHECKSH-NEXT: # Driver args: {{.*}}"-fsyntax-only"
+// CHECKSH-SAME: /Brepro
+// CHECKSH-SAME: /source-charset:utf-8
+// CHECKSH-NOT: -mno-incremental-linker-compatible
+// CHECKSH-NOT: -finput-charset=utf-8
+// CHECKSH-NEXT: # Original command: {{.*$}}
+// CHECKSH-NEXT: "-cc1"
+// CHECKSH: "-main-file-name" "crash-report-clang-cl.c"
+// CHECKSH: "crash-report-{{[^ ]*}}.c"