commit ade321e7ddf76483ea8b9fd2921216e026c9dc1b
author Nico Weber <nicolasweber@gmx.de> Tue Apr 10 18:53:28 2018 +0000
committer Nico Weber <nicolasweber@gmx.de> Tue Apr 10 18:53:28 2018 +0000
tree 9d0f22b8eec20831e79785ad0ec7f366197fd6e3
parent 298e1712d827a05b2cbb2936a9fc67745fa68c13

Revert r329684 (and follow-ups 329693, 329714). See discussion on https://reviews.llvm.org/D43578.

llvm-svn: 329739

clang/lib/Frontend/ASTMerge.cpp

diff --git a/clang/lib/Frontend/ASTMerge.cpp b/clang/lib/Frontend/ASTMerge.cpp
index b1a3407..6ec0e2a 100644
--- a/clang/lib/Frontend/ASTMerge.cpp
+++ b/clang/lib/Frontend/ASTMerge.cpp
@@ -6,14 +6,13 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+#include "clang/Frontend/ASTUnit.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ASTDiagnostic.h"
 #include "clang/AST/ASTImporter.h"
 #include "clang/Basic/Diagnostic.h"
-#include "clang/Frontend/ASTUnit.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Frontend/FrontendActions.h"
-#include "llvm/Support/Timer.h"
 
 using namespace clang;
 
@@ -32,8 +31,6 @@
 }
 
 void ASTMergeAction::ExecuteAction() {
-  llvm::NamedRegionTimer T("astmerge", "AST Merge actions", GroupName,
-                           GroupDescription, llvm::TimePassesIsEnabled);
   CompilerInstance &CI = getCompilerInstance();
   CI.getDiagnostics().getClient()->BeginSourceFile(
                                              CI.getASTContext().getLangOpts());