Revert r122143 through r122140, which collectively broke the LLVMC tests on
the buildbots.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122149 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CompilerDriver/Tool.cpp b/lib/CompilerDriver/Tool.cpp
index 876759a..232bd41 100644
--- a/lib/CompilerDriver/Tool.cpp
+++ b/lib/CompilerDriver/Tool.cpp
@@ -61,7 +61,7 @@
       Out.appendSuffix(OutputSuffix);
     }
     else {
-      Out.set(sys::path::stem(In.str()));
+      Out.set(In.getBasename());
       Out.appendSuffix(OutputSuffix);
     }
   }
@@ -69,7 +69,7 @@
     if (IsJoin())
       Out = MakeTempFile(TempDir, "tmp", OutputSuffix);
     else
-      Out = MakeTempFile(TempDir, sys::path::stem(In.str()), OutputSuffix);
+      Out = MakeTempFile(TempDir, In.getBasename(), OutputSuffix);
   }
   return Out;
 }