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

the buildbots.

llvm-svn: 122149

1 files changed, 2 insertions, 2 deletions

diff --git a/llvm/lib/CompilerDriver/Tool.cpp b/llvm/lib/CompilerDriver/Tool.cpp
index 876759aa72b..232bd41c4ba 100644
--- a/llvm/lib/CompilerDriver/Tool.cpp
+++ b/llvm/lib/CompilerDriver/Tool.cpp
@@ -61,7 +61,7 @@ sys::Path Tool::OutFilename(const sys::Path& In,
       Out.appendSuffix(OutputSuffix);
     }
     else {
-      Out.set(sys::path::stem(In.str()));
+      Out.set(In.getBasename());
       Out.appendSuffix(OutputSuffix);
     }
   }
@@ -69,7 +69,7 @@ sys::Path Tool::OutFilename(const sys::Path& In,
     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;
 }