---

yaml
---
r: 278421
b: refs/heads/swift-5.1-old-llvm-branch
c: dbb998f
h: refs/heads/master
i:
  278419: 8e144b6

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: ee40bfbdba4e6ea2efb6b0b31dd7f20886cb978b
+refs/heads/swift-5.1-old-llvm-branch: dbb998f18960d1bc86fa0996e3c3152d3e83f33b
 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/NameLookup.cpp

@@ -1669,7 +1669,7 @@ namespace {
     case ScopeLookupResult::finished:
       return std::make_pair(ScopeLookupResult::finished, results.nextDC);
     }
-    if (checkGenericParameters(DC))
+    if (addGenericParametersHereAndInEnclosingScopes(DC))
       return std::make_pair(ScopeLookupResult::finished, DC);
 
     // UP TO HERE
@@ -1729,7 +1729,7 @@ namespace {
   /// Check the generic parameters of our context.
   /// Return true if done with lookup
   /// TODO: Factor with addGenericParmeters below
-  bool checkGenericParameters(DeclContext *DC) {
+  bool addGenericParametersHereAndInEnclosingScopes(DeclContext *DC) {
     for (GenericParamList *dcGenericParams = getGenericParams(DC);
          dcGenericParams;
          dcGenericParams = dcGenericParams->getOuterParameters()) {
@@ -1743,7 +1743,7 @@ namespace {
   }
 
   /// Consume generic parameters
-  void addGenericParameters(AbstractFunctionDecl *AFD) {
+  void addGenericParametersForFunction(AbstractFunctionDecl *AFD) {
     // If we're inside a function context, we've already moved to
     // the parent DC, so we have to check the function's generic
     // parameters first.
@@ -1898,7 +1898,7 @@ namespace {
       populateLookupDeclsFromContext(AFD->getDeclContext(), lookupDecls);
       DeclContext *const MetaBaseDC = AFD->getDeclContext();
 
-      addGenericParameters(AFD);
+      addGenericParametersForFunction(AFD);
       return PerScopeLookupState{
         isFinishedWithLookupNowThatIsAboutToLookForOuterResults()
         ? ScopeLookupResult::finished
@@ -1919,7 +1919,7 @@ namespace {
       };
     }
     // Look in the generic parameters after checking our local declaration.
-    addGenericParameters(AFD);
+    addGenericParametersForFunction(AFD);
     return PerScopeLookupState{
       isFinishedWithLookupNowThatIsAboutToLookForOuterResults()
       ? ScopeLookupResult::finished