From: Daniel Dunbar <daniel@zuster.org>
Date: Mon, 30 Nov 2009 07:18:20 +0000 (+0000)
Subject: Simplify.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae8e17e85acde7d7f3274d0957afa88995ea3cd7;p=clang

Simplify.

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

diff --git a/tools/clang-cc/clang-cc.cpp b/tools/clang-cc/clang-cc.cpp
index 3591226307..ab3ede9658 100644
--- a/tools/clang-cc/clang-cc.cpp
+++ b/tools/clang-cc/clang-cc.cpp
@@ -142,8 +142,7 @@ static FrontendAction *CreateFrontendAction(CompilerInstance &CI) {
 }
 
 static bool ConstructCompilerInvocation(CompilerInvocation &Opts,
-                                        Diagnostic &Diags,
-                                        const char *Argv0, bool &IsAST) {
+                                        Diagnostic &Diags, const char *Argv0) {
   // Initialize target options.
   InitializeTargetOptions(Opts.getTargetOpts());
 
@@ -164,8 +163,7 @@ static bool ConstructCompilerInvocation(CompilerInvocation &Opts,
   //
   // FIXME: These aren't used during operations on ASTs. Split onto a separate
   // code path to make this obvious.
-  IsAST = (IK == FrontendOptions::IK_AST);
-  if (!IsAST)
+  if (IK != FrontendOptions::IK_AST)
     InitializeLangOptions(Opts.getLangOpts(), IK);
 
   // Initialize the static analyzer options.
@@ -296,10 +294,8 @@ int main(int argc, char **argv) {
   //
   // FIXME: We should move .ast inputs to taking a separate path, they are
   // really quite different.
-  bool IsAST = false;
   if (!ConstructCompilerInvocation(Clang.getInvocation(),
-                                   Clang.getDiagnostics(),
-                                   argv[0], IsAST))
+                                   Clang.getDiagnostics(), argv[0]))
     return 1;
 
   // Create the target instance.
@@ -328,6 +324,8 @@ int main(int argc, char **argv) {
 
     // If we aren't using an AST file, setup the file and source managers and
     // the preprocessor.
+    bool IsAST =
+      Clang.getFrontendOpts().Inputs[i].first == FrontendOptions::IK_AST;
     if (!IsAST) {
       if (!i) {
         // Create a file manager object to provide access to and cache the