commit 33bdbc66d3ee912e8f50f194a40e5a8237a4ba26
author Justin Bogner <mail@justinbogner.com> Tue Oct 21 18:03:08 2014 +0000
committer Justin Bogner <mail@justinbogner.com> Tue Oct 21 18:03:08 2014 +0000
tree 1d350ad9eafc39be0d3775e4497f96b048943023
parent dd86f33902071c39b3ec2ab8c572df32beb8b29b

Driver: Quote the command in crash reproduction scripts.

This fixes crash report generation when filenames have spaces. It also
removes an awkward workaround that quoted *some* arguments when
generating crash reports.

llvm-svn: 220307

clang/lib/Driver/Driver.cpp

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index baf154f..ccefbd8 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -547,7 +547,7 @@
     Diag(clang::diag::note_drv_command_failed_diag_msg)
         << "Error generating run script: " + Script + " " + EC.message();
   } else {
-    Cmd.Print(ScriptOS, "\n", /*Quote=*/false, &CrashInfo);
+    Cmd.Print(ScriptOS, "\n", /*Quote=*/true, &CrashInfo);
     Diag(clang::diag::note_drv_command_failed_diag_msg) << Script;
   }
   Diag(clang::diag::note_drv_command_failed_diag_msg)

clang/lib/Driver/Job.cpp

diff --git a/clang/lib/Driver/Job.cpp b/clang/lib/Driver/Job.cpp
index 34d38b9..c5b3f5a 100644
--- a/clang/lib/Driver/Job.cpp
+++ b/clang/lib/Driver/Job.cpp
@@ -73,12 +73,6 @@
   return 0;
 }
 
-static bool quoteNextArg(const char *flag) {
-  return llvm::StringSwitch<bool>(flag)
-    .Case("-D", true)
-    .Default(false);
-}
-
 static void PrintArg(raw_ostream &OS, const char *Arg, bool Quote) {
   const bool Escape = std::strpbrk(Arg, "\"\\$");
 
@@ -189,11 +183,6 @@
 
     OS << ' ';
     PrintArg(OS, Arg, Quote);
-
-    if (CrashInfo && quoteNextArg(Arg) && i + 1 < e) {
-      OS << ' ';
-      PrintArg(OS, Args[++i], true);
-    }
   }
 
   if (CrashInfo && !CrashInfo->VFSPath.empty()) {