commit a4ec57c2c5e0f9fa18e517bac828a1f87b7c39f6
author Dan Albert <danalbert@google.com> Fri Oct 10 02:26:00 2014 +0000
committer Dan Albert <danalbert@google.com> Fri Oct 10 02:26:00 2014 +0000
tree e721ec9cf59c35ceaa9fb90c9f89234495544a43
parent d30d8f46584c062fc65dc4161ea5a041a03534cc

Hopefully fixes test failures for msvc.

Looks like llvm::sys::path::filename() was canonicalizing my paths
before emitting them for FileCheck to stumble over.

Fix a style nit with r219460 while I'm at it.

llvm-svn: 219464

clang/lib/Driver/Tools.cpp

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index abcbb5c..0bbc964 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -3242,8 +3242,7 @@
     if (Output.isFilename()) {
       CmdArgs.push_back("-coverage-file");
       SmallString<128> CoverageFilename;
-      Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o);
-      if (FinalOutput) {
+      if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o)) {
         CoverageFilename = FinalOutput->getValue();
       } else {
         CoverageFilename = llvm::sys::path::filename(Output.getBaseInput());