[cfe-commits] r114713 - /cfe/trunk/lib/Driver/Driver.cpp

[Nick Lewycky]

Author: nicholas
Date: Thu Sep 23 19:46:53 2010
New Revision: 114713

URL: http://llvm.org/viewvc/llvm-project?rev=114713&view=rev
Log:
Revert r114712 due to failure on darwin buildbot.

Modified:
    cfe/trunk/lib/Driver/Driver.cpp

Modified: cfe/trunk/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=114713&r1=114712&r2=114713&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Thu Sep 23 19:46:53 2010
@@ -1151,22 +1151,16 @@
                                        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 =