---

yaml
---
r: 349534
b: refs/heads/master-next
c: bb83c39
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 8b17a1aa4952495df286165341f517c8d1a768fb
+refs/heads/master-next: bb83c392ffb3cce181857195d4533f61bfd534c5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/include/swift/AST/ASTScope.h

@@ -160,6 +160,22 @@ FRONTEND_STATISTIC(AST, NumUnqualifiedLookup)
 /// AnyObject lookup.
 FRONTEND_STATISTIC(AST, NumModuleLookupClassMember)
 
+/// Number of body scopes for iterable types
+FRONTEND_STATISTIC(AST, NumIterableTypeBodyASTScopes)
+
+/// Number of expansions of body scopes for iterable types
+FRONTEND_STATISTIC(AST, NumIterableTypeBodyASTScopeExpansions)
+
+/// Number of brace statment scopes for iterable types
+FRONTEND_STATISTIC(AST, NumBraceStmtASTScopes)
+
+/// Number of expansions of brace statement scopes for iterable types
+FRONTEND_STATISTIC(AST, NumBraceStmtASTScopeExpansions)
+
+/// Number of ASTScope lookups
+FRONTEND_STATISTIC(AST, NumASTScopeLookups)
+
+
 /// Number of full function bodies parsed.
 FRONTEND_STATISTIC(Parse, NumFunctionsParsed)
 

branches/master-next/include/swift/Basic/Statistics.def

@@ -297,6 +297,7 @@ class CompilerInvocation {
   /// Called from lldb, see rdar://53971116
   void disableASTScopeLookup() {
     LangOpts.EnableASTScopeLookup = false;
+    LangOpts.LazyASTScopes = false;
   }
 
   CodeCompletionCallbacksFactory *getCodeCompletionFactory() const {

branches/master-next/include/swift/Frontend/Frontend.h

@@ -41,6 +41,8 @@ llvm::SmallVector<const ASTScopeImpl *, 0> ASTScope::unqualifiedLookup(
     SourceFile *SF, DeclName name, SourceLoc loc,
     const DeclContext *startingContext,
     namelookup::AbstractASTScopeDeclConsumer &consumer) {
+  if (auto *s = SF->getASTContext().Stats)
+    ++s->getFrontendCounters().NumASTScopeLookups;
   return ASTScopeImpl::unqualifiedLookup(SF, name, loc, startingContext,
                                          consumer);
 }
@@ -82,7 +84,7 @@ AbstractClosureScope::getClosureIfClosureScope() const {
 
 // Conservative, because using precise info would be circular
 SourceRange
-AttachedPropertyWrapperScope::getSourceRangeFor(const VarDecl *const vd) {
+AttachedPropertyWrapperScope::getSourceRangeOfVarDecl(const VarDecl *const vd) {
   SourceRange sr;
   for (auto *attr : vd->getAttrs().getAttributes<CustomAttr>()) {
     if (sr.isInvalid())