---

yaml
---
r: 348628
b: refs/heads/master
c: e2182dc
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 25488fea8071ff521bf19a0953695b7704f1cb2d
+refs/heads/master: e2182dc16675bc9c196f8ea7b748159c970d737c
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/Basic/LangOptions.h

@@ -246,7 +246,7 @@ namespace swift {
     /// Default is in \c ParseLangArgs
     ///
     /// This is a staging flag; eventually it will be removed.
-    bool EnableASTScopeLookup = false;
+    bool EnableASTScopeLookup = true;
 
     /// Someday, ASTScopeLookup will supplant lookup in the parser
     bool DisableParserLookup = false;

trunk/lib/AST/ASTScopeCreation.cpp

@@ -1750,7 +1750,7 @@ void ASTScopeImpl::reexpand(ScopeCreator &scopeCreator) {
   auto astAncestorScopes = rescueASTAncestorScopesForReuseFromMeOrDescendants();
   disownDescendants(scopeCreator);
   // If the expansion recurses back into the tree for lookup, the ASTAncestor
-  // scopes will have already been rescued and won't be found! HERE
+  // scopes will have already been rescued and won't be found!
   expandAndBeCurrent(scopeCreator);
   replaceASTAncestorScopes(astAncestorScopes);
 }