---

yaml
---
r: 278462
b: refs/heads/swift-5.1-old-llvm-branch
c: 6093a7f
h: refs/heads/master

Author: davidungar

[refs]

@@ -1241,7 +1241,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-01-24-a: b6f62823aa5010b2ae53f15f72a57
 refs/heads/marcrasi-astverifier-disable: 3fac766a23a77ebd0640296bfd7fc116ea60a4e0
 refs/heads/revert-22227-a-tall-white-fountain-played: adfce60b2eaa54903ea189bed8a783bca609fa53
 refs/heads/revert-22300-revert-22227-a-tall-white-fountain-played: 5f92040224df7dd4e618fdfb367349df64d8acad
-refs/heads/swift-5.1-old-llvm-branch: 6982e66ddf033762d860e0c5043869df297653b4
+refs/heads/swift-5.1-old-llvm-branch: 6093a7fa90df3d126c074c848cb3050674a1ff42
 refs/heads/swift-5.1-branch: 8060872acb4105d9655e020fe047e1ebcd77d0fb
 refs/tags/swift-4.2.2-RELEASE: e429d1f1aaf59e69d38207a96e56265c7f6fccec
 refs/tags/swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-02-a: 3e5a03d32ff3b1e9af90d6c1198c14f938379a6e

branches/swift-5.1-old-llvm-branch/lib/AST/UnqualifiedLookup.cpp

@@ -261,7 +261,10 @@ class UnqualifiedLookupFactory {
   /// results yet?
   bool isLookupDoneWithoutIncludingOuterResults() const;
 
-  void setIndexOfFirstOuterResultIfNotSetAlready();
+  /// Every time lookup finishes searching a scope, call me
+  /// to record the dividing line between results from first fruitful scope and
+  /// the result.
+  void recordCompletionOfAScope();
 
 #pragma mark normal (non-ASTScope-based) lookup declarations
 
@@ -414,10 +417,10 @@ void UnqualifiedLookupFactory::fillInLookup() {
   // TODO: Does the debugger client care about compound names?
   if (Name.isSimpleName() && DebugClient &&
       DebugClient->lookupOverrides(Name.getBaseName(), DC, Loc,
+  recordDependencyOnTopLevelName(DC, Name, isCascadingUse);
                                    isOriginallyTypeLookup, Results))
     return;
 
-  recordDependencyOnTopLevelName(DC, Name, isCascadingUse);
   addPrivateImports(DC);
   if (addNamesKnownToDebugClient(DC))
     return;
@@ -429,7 +432,7 @@ void UnqualifiedLookupFactory::fillInLookup() {
   if (lookForAModuleWithTheGivenName(DC))
     return;
   // Make sure we've recorded the inner-result-boundary.
-  setIndexOfFirstOuterResultIfNotSetAlready(); // DMU elim?
+  recordCompletionOfAScope(); // DMU elim?
 }
 
 bool UnqualifiedLookupFactory::shouldUseASTScopeLookup() const {
@@ -511,7 +514,7 @@ UnqualifiedLookupFactory::lookInScopeForASTScopeLookup(
     Consumer.foundDecl(local, getLocalDeclVisibilityKind(currentScope));
   }
 
-  setIndexOfFirstOuterResultIfNotSetAlready();
+  recordCompletionOfAScope();
   // If we found anything, we're done.
   if (isLookupDoneWithoutIncludingOuterResults())
     return None;
@@ -641,7 +644,7 @@ UnqualifiedLookupFactory::lookIntoDeclarationContextForASTScopeLookup(
     } else {
       filterForDiscriminator(Results, DebugClient);
 
-      setIndexOfFirstOuterResultIfNotSetAlready();
+      recordCompletionOfAScope();
       if (isLookupDoneWithoutIncludingOuterResults())
         return None;
     }
@@ -740,7 +743,7 @@ UnqualifiedLookupFactory::lookupInPatternBindingInitializer(
   // instance member lookup.
   if (auto *selfParam = PBI->getImplicitSelfDecl()) {
     Consumer.foundDecl(selfParam, DeclVisibilityKind::FunctionParameter);
-    setIndexOfFirstOuterResultIfNotSetAlready();
+    recordCompletionOfAScope();
     if (isLookupDoneWithoutIncludingOuterResults())
       return None;
     DeclContext *const parent = PBI->getParent();
@@ -789,15 +792,15 @@ UnqualifiedLookupFactory::lookupInFunctionDecl(AbstractFunctionDecl *AFD,
 
     namelookup::FindLocalVal localVal(SM, Loc, Consumer);
     localVal.visit(AFD->getBody());
-    
-    setIndexOfFirstOuterResultIfNotSetAlready();
+
+    recordCompletionOfAScope();
     if (isLookupDoneWithoutIncludingOuterResults())
       return None;
 
     if (auto *P = AFD->getImplicitSelfDecl())
       localVal.checkValueDecl(P, DeclVisibilityKind::FunctionParameter);
     localVal.checkParameterList(AFD->getParameters());
-    setIndexOfFirstOuterResultIfNotSetAlready();
+    recordCompletionOfAScope();
     if (isLookupDoneWithoutIncludingOuterResults())
       return None;
   }
@@ -811,7 +814,7 @@ UnqualifiedLookupFactory::lookupInFunctionDecl(AbstractFunctionDecl *AFD,
 
   // Look in the generic parameters after checking our local declaration.
   addGenericParametersForFunction(AFD);
-  setIndexOfFirstOuterResultIfNotSetAlready();
+  recordCompletionOfAScope();
   if (isLookupDoneWithoutIncludingOuterResults())
     return None;
 
@@ -849,12 +852,12 @@ UnqualifiedLookupFactory::lookupInClosure(AbstractClosureExpr *ACE,
       namelookup::FindLocalVal localVal(SM, Loc, Consumer);
       if (auto body = CE->getBody())
         localVal.visit(body);
-      setIndexOfFirstOuterResultIfNotSetAlready();
+      recordCompletionOfAScope();
       if (isLookupDoneWithoutIncludingOuterResults())
         return None;
       if (auto params = CE->getParameters())
         localVal.checkParameterList(params);
-      setIndexOfFirstOuterResultIfNotSetAlready();
+      recordCompletionOfAScope();
       if (isLookupDoneWithoutIncludingOuterResults())
         return None;
     }
@@ -939,7 +942,7 @@ bool UnqualifiedLookupFactory::addGenericParametersHereAndInEnclosingScopes(
     namelookup::FindLocalVal localVal(SM, Loc, Consumer);
     localVal.checkGenericParams(dcGenericParams);
 
-    setIndexOfFirstOuterResultIfNotSetAlready();
+    recordCompletionOfAScope();
     if (isLookupDoneWithoutIncludingOuterResults())
       return true;
   }
@@ -967,7 +970,7 @@ bool UnqualifiedLookupFactory::addLocalVariableResults(DeclContext *dc) {
       // local types.
       namelookup::FindLocalVal localVal(SM, Loc, Consumer);
       localVal.checkSourceFile(*SF);
-      setIndexOfFirstOuterResultIfNotSetAlready();
+      recordCompletionOfAScope();
       if (isLookupDoneWithoutIncludingOuterResults())
         return true;
     }
@@ -1012,7 +1015,7 @@ bool UnqualifiedLookupFactory::handleUnavailableInnerResults(
   }
   filterForDiscriminator(Results, DebugClient);
 
-  setIndexOfFirstOuterResultIfNotSetAlready();
+  recordCompletionOfAScope();
   return isLookupDoneWithoutIncludingOuterResults();
 }
 
@@ -1052,14 +1055,14 @@ bool UnqualifiedLookupFactory::addNamesKnownToDebugClient(DeclContext *dc) {
   if (Name.isSimpleName() && DebugClient)
     DebugClient->lookupAdditions(Name.getBaseName(), dc, Loc,
                                  isOriginallyTypeLookup, Results);
-  setIndexOfFirstOuterResultIfNotSetAlready();
+  recordCompletionOfAScope();
   // If we've found something, we're done.
   return !Results.empty();
 }
 
 bool UnqualifiedLookupFactory::addUnavailableInnerResults() {
   Results = std::move(UnavailableInnerResults);
-  setIndexOfFirstOuterResultIfNotSetAlready();
+  recordCompletionOfAScope();
   return !Results.empty();
 }
 
@@ -1072,7 +1075,7 @@ bool UnqualifiedLookupFactory::lookForAModuleWithTheGivenName(
   // Look for a module with the given name.
   if (Name.isSimpleName(M.getName())) {
     Results.push_back(LookupResultEntry(&M));
-    setIndexOfFirstOuterResultIfNotSetAlready();
+    recordCompletionOfAScope();
     return true;
   }
   ModuleDecl *desiredModule = Ctx.getLoadedModule(Name.getBaseIdentifier());
@@ -1110,7 +1113,7 @@ bool UnqualifiedLookupFactory::isLookupDoneWithoutIncludingOuterResults()
   return !Results.empty() && !options.contains(Flags::IncludeOuterResults);
 }
 
-void UnqualifiedLookupFactory::setIndexOfFirstOuterResultIfNotSetAlready() {
+void UnqualifiedLookupFactory::recordCompletionOfAScope() {
   // OK to call (NOOP) if there are more inner results and Results is empty
   if (IndexOfFirstOuterResult == 0)
     IndexOfFirstOuterResult = Results.size();