Revert r114712 due to failure on darwin buildbot.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@114713 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 4 insertions, 10 deletions

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 84a33a5f77..0555342bc8 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -1151,22 +1151,16 @@ const char *Driver::GetNamedOutputPath(Compilation &C,
                                        const char *BaseInput,
                                        bool AtTopLevel) const {
   llvm::PrettyStackTraceString CrashInfo("Computing output path");
-
-  // Default to writing to stdout.
-  if (AtTopLevel && isa<PreprocessJobAction>(JA)) {
-    if (Arg *DepOutput = C.getArgs().getLastArg(options::OPT_MF))
-      return C.addResultFile(DepOutput->getValue(C.getArgs()));
-    if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o))
-      return C.addResultFile(FinalOutput->getValue(C.getArgs()));
-    return "-";
-  }
-
   // Output to a user requested destination?
   if (AtTopLevel && !isa<DsymutilJobAction>(JA)) {
     if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o))
       return C.addResultFile(FinalOutput->getValue(C.getArgs()));
   }
 
+  // Default to writing to stdout?
+  if (AtTopLevel && isa<PreprocessJobAction>(JA))
+    return "-";
+
   // Output to a temporary file?
   if (!AtTopLevel && !C.getArgs().hasArg(options::OPT_save_temps)) {
     std::string TmpName =