<div dir="ltr">Sorry, r214931.<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Aug 5, 2014 at 3:45 PM, NAKAMURA Takumi <span dir="ltr"><<a href="mailto:geek4civic@gmail.com" target="_blank">geek4civic@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">It broke driver tests. Could you update testcases?<br>
<br>
<a href="http://bb.pgr.jp/builders/ninja-clang-i686-msc17-R/builds/9748" target="_blank">http://bb.pgr.jp/builders/ninja-clang-i686-msc17-R/builds/9748</a><br>
<br>
2014-08-06 5:49 GMT+09:00 Reid Kleckner <<a href="mailto:reid@kleckner.net">reid@kleckner.net</a>>:<br>
<div class="HOEnZb"><div class="h5">> Author: rnk<br>
> Date: Tue Aug  5 15:49:12 2014<br>
> New Revision: 214924<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=214924&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=214924&view=rev</a><br>
> Log:<br>
> Make crash diagnostics on Windows the tiniest bit more useful<br>
><br>
> This escapes any backslashes in the executable path and fixes an issue<br>
> with a trailing quote when the main file name had to be quoted during<br>
> printing.<br>
><br>
> It's impossible to test this without putting backslashes or quotes into<br>
> the executable path, so I didn't add automated tests.<br>
><br>
> The crash diagnostics are still only useful if you're using bash on<br>
> Windows, though.  This should probably be writing a batch file instead.<br>
><br>
> Modified:<br>
>     cfe/trunk/lib/Driver/Driver.cpp<br>
>     cfe/trunk/lib/Driver/Job.cpp<br>
><br>
> Modified: cfe/trunk/lib/Driver/Driver.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=214924&r1=214923&r2=214924&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=214924&r1=214923&r2=214924&view=diff</a><br>

> ==============================================================================<br>
> --- cfe/trunk/lib/Driver/Driver.cpp (original)<br>
> +++ cfe/trunk/lib/Driver/Driver.cpp Tue Aug  5 15:49:12 2014<br>
> @@ -548,6 +548,8 @@ void Driver::generateCompilationDiagnost<br>
>          StringRef NewFilename = llvm::sys::path::filename(*it);<br>
>          I = StringRef(Cmd).rfind(OldFilename);<br>
>          E = I + OldFilename.size();<br>
> +        if (E + 1 < Cmd.size() && Cmd[E] == '"')<br>
> +          ++E;  // Replace a trailing quote if present.<br>
>          I = Cmd.rfind(" ", I) + 1;<br>
>          Cmd.replace(I, E - I, NewFilename.data(), NewFilename.size());<br>
>          if (!VFS.empty()) {<br>
><br>
> Modified: cfe/trunk/lib/Driver/Job.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Job.cpp?rev=214924&r1=214923&r2=214924&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Job.cpp?rev=214924&r1=214923&r2=214924&view=diff</a><br>

> ==============================================================================<br>
> --- cfe/trunk/lib/Driver/Job.cpp (original)<br>
> +++ cfe/trunk/lib/Driver/Job.cpp Tue Aug  5 15:49:12 2014<br>
> @@ -95,7 +95,8 @@ static void PrintArg(raw_ostream &OS, co<br>
><br>
>  void Command::Print(raw_ostream &OS, const char *Terminator, bool Quote,<br>
>                      bool CrashReport) const {<br>
> -  OS << " \"" << Executable << '"';<br>
> +  // Always quote the exe.<br>
> +  PrintArg(OS, Executable, /*Quote=*/true);<br>
><br>
>    for (size_t i = 0, e = Arguments.size(); i < e; ++i) {<br>
>      const char *const Arg = Arguments[i];<br>
><br>
><br>
> _______________________________________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</div></div></blockquote></div><br></div>