3 files changed, 4 insertions, 20 deletions
diff --git a/clang/Driver/DiagChecker.cpp b/clang/Driver/DiagChecker.cpp
index 51f3979b92a..c4749512442 100644
--- a/clang/Driver/DiagChecker.cpp
+++ b/clang/Driver/DiagChecker.cpp
@@ -252,14 +252,6 @@ static bool CheckResults(Preprocessor &PP,
 }
 
 
-/// CheckASTConsumer - Implement diagnostic checking for AST consumers.
-bool clang::CheckASTConsumer(Preprocessor &PP, ASTConsumer* C) {
-  
-  // Parse the AST and run the consumer, ultimately deleting C.
-  ParseAST(PP, C);
-  return CheckDiagnostics(PP);
-}
-
 /// CheckDiagnostics - Gather the expected diagnostics and check them.
 bool clang::CheckDiagnostics(Preprocessor &PP) {
   // Gather the set of expected diagnostics.
diff --git a/clang/Driver/clang.cpp b/clang/Driver/clang.cpp
index 0bc5ca43bc3..ca0dc444384 100644
--- a/clang/Driver/clang.cpp
+++ b/clang/Driver/clang.cpp
@@ -1221,7 +1221,6 @@ static ASTConsumer* CreateASTConsumer(const std::string& InFile,
 ///
 static void ProcessInputFile(Preprocessor &PP, PreprocessorFactory &PPF,
                              const std::string &InFile, ProgActions PA) {
-
   llvm::OwningPtr<ASTConsumer> Consumer;
   bool ClearSourceMgr = false;
   
@@ -1318,15 +1317,11 @@ static void ProcessInputFile(Preprocessor &PP, PreprocessorFactory &PPF,
     break;
   }
   
-  if (Consumer) {
-    if (VerifyDiagnostics)
-      exit(CheckASTConsumer(PP, Consumer.get()));
-    
+  if (Consumer)
     ParseAST(PP, Consumer.get(), Stats, !DisableFree);
-  } else {
-    if (VerifyDiagnostics)
-      exit(CheckDiagnostics(PP));
-  }
+
+  if (VerifyDiagnostics)
+    exit(CheckDiagnostics(PP));
 
   if (Stats) {
     fprintf(stderr, "\nSTATISTICS FOR '%s':\n", InFile.c_str());
diff --git a/clang/Driver/clang.h b/clang/Driver/clang.h
index a3b3bcc68f6..46c0085f1fe 100644
--- a/clang/Driver/clang.h
+++ b/clang/Driver/clang.h
@@ -43,9 +43,6 @@ MinimalAction *CreatePrintParserActionsAction(IdentifierTable &);
 
 /// EmitLLVMFromASTs - Implement -emit-llvm, which generates llvm IR from C.
 void EmitLLVMFromASTs(Preprocessor &PP, bool PrintStats);
-  
-/// CheckASTConsumer - Implement diagnostic checking for AST consumers.
-bool CheckASTConsumer(Preprocessor &PP, ASTConsumer* C);
 
 /// CheckDiagnostics - Gather the expected diagnostics and check them.
 bool CheckDiagnostics(Preprocessor &PP);