Merge pull request #5608 from graydon/statistic-helpers

Author: swift-ci

include/swift/Basic/Statistic.h

@@ -0,0 +1,25 @@
+//===--- Statistic.h - Helpers for Lllvm::Statistic ---------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2016 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_BASIC_STATISTIC_H
+#define SWIFT_BASIC_STATISTIC_H
+
+#include "llvm/ADT/Statistic.h"
+
+#define SWIFT_FUNC_STAT                                                 \
+  do {                                                                  \
+    static llvm::Statistic FStat =                                      \
+      {DEBUG_TYPE, __func__, __func__, {0}, false};                     \
+    ++FStat;                                                            \
+  } while (0)
+
+#endif // SWIFT_BASIC_STATISTIC_H

lib/Sema/TypeCheckDecl.cpp

@@ -31,6 +31,7 @@
 #include "swift/AST/PrettyStackTrace.h"
 #include "swift/AST/ReferencedNameTracker.h"
 #include "swift/AST/TypeWalker.h"
+#include "swift/Basic/Statistic.h"
 #include "swift/Parse/Lexer.h"
 #include "swift/Parse/Parser.h"
 #include "swift/Sema/IterativeTypeChecker.h"
@@ -45,6 +46,8 @@
 #include "llvm/ADT/Twine.h"
 using namespace swift;
 
+#define DEBUG_TYPE "TypeCheckDecl"
+
 namespace {
 
 /// Used during enum raw value checking to identify duplicate raw values.
@@ -6968,7 +6971,9 @@ void TypeChecker::validateDecl(ValueDecl *D, bool resolveTypeParams) {
       validateExtension(ext);
     }
   }
-  
+
+  SWIFT_FUNC_STAT;
+
   switch (D->getKind()) {
   case DeclKind::Import:
   case DeclKind::Extension:

lib/Sema/TypeCheckStmt.cpp

@@ -25,6 +25,7 @@
 #include "swift/Basic/Range.h"
 #include "swift/Basic/STLExtras.h"
 #include "swift/Basic/SourceManager.h"
+#include "swift/Basic/Statistic.h"
 #include "swift/Parse/Lexer.h"
 #include "swift/Parse/LocalContext.h"
 #include "llvm/ADT/DenseMap.h"
@@ -38,6 +39,8 @@
 
 using namespace swift;
 
+#define DEBUG_TYPE "TypeCheckStmt"
+
 namespace {
   class ContextualizeClosures : public ASTWalker {
     DeclContext *ParentDC;
@@ -1248,6 +1251,8 @@ bool TypeChecker::typeCheckAbstractFunctionBody(AbstractFunctionDecl *AFD) {
   if (!AFD->getBody())
     return false;
 
+  SWIFT_FUNC_STAT;
+
   Optional<FunctionBodyTimer> timer;
   if (DebugTimeFunctionBodies || WarnLongFunctionBodies)
     timer.emplace(AFD, DebugTimeFunctionBodies, WarnLongFunctionBodies);

lib/Sema/TypeCheckType.cpp

@@ -28,6 +28,7 @@
 #include "swift/AST/PrettyStackTrace.h"
 #include "swift/AST/TypeLoc.h"
 #include "swift/Basic/SourceManager.h"
+#include "swift/Basic/Statistic.h"
 #include "swift/Basic/StringExtras.h"
 #include "swift/ClangImporter/ClangImporter.h"
 #include "llvm/ADT/APInt.h"
@@ -37,6 +38,8 @@
 #include "llvm/ADT/Twine.h"
 using namespace swift;
 
+#define DEBUG_TYPE "TypeCheckType"
+
 GenericTypeResolver::~GenericTypeResolver() { }
 
 Type TypeChecker::getArraySliceType(SourceLoc loc, Type elementType) {
@@ -1526,6 +1529,8 @@ bool TypeChecker::validateType(TypeLoc &Loc, DeclContext *DC,
   if (Loc.wasValidated())
     return Loc.isError();
 
+  SWIFT_FUNC_STAT;
+
   if (Loc.getType().isNull()) {
     // Raise error if we parse an IUO type in an illegal position.
     checkForIllegalIUOs(*this, Loc.getTypeRepr(), options);