r188353 - revert 188352

[Shuxin Yang]

Author: shuxin_yang
Date: Tue Aug 13 23:47:39 2013
New Revision: 188353

URL: http://llvm.org/viewvc/llvm-project?rev=188353&view=rev
Log:
revert 188352

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=188353&r1=188352&r2=188353&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Tue Aug 13 23:47:39 2013
@@ -1339,10 +1339,6 @@ Action *Driver::ConstructPhaseAction(con
       types::ID Output =
         Args.hasArg(options::OPT_S) ? types::TY_LTO_IR : types::TY_LTO_BC;
       return new CompileJobAction(Input, Output);
-    } else if (Args.hasArg(options::OPT_emit_llvm)) {
-      types::ID Output =
-        Args.hasArg(options::OPT_S) ? types::TY_LLVM_IR : types::TY_LLVM_BC;
-      return new CompileJobAction(Input, Output);
     } else {
       return new CompileJobAction(Input, types::TY_PP_Asm);
     }
@@ -1355,7 +1351,9 @@ Action *Driver::ConstructPhaseAction(con
 }
 
 bool Driver::IsUsingLTO(const ArgList &Args) const {
-  if (Args.hasFlag(options::OPT_flto, options::OPT_fno_lto, false))
+  // Check for -emit-llvm or -flto.
+  if (Args.hasArg(options::OPT_emit_llvm) ||
+      Args.hasFlag(options::OPT_flto, options::OPT_fno_lto, false))
     return true;
 
   // Check for -O4.