---

yaml
---
r: 278443
b: refs/heads/swift-5.1-old-llvm-branch
c: 1ce86b9
h: refs/heads/master
i:
  278441: 3df1620
  278439: da50a4c

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: 8e7ff01caa0a58f01508e193901de909c636cfec
+refs/heads/swift-5.1-old-llvm-branch: 1ce86b9def163d9df15079d04f3c6220047df962
 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

@@ -1497,9 +1497,9 @@ namespace {
     computeBaseNLOptions(const LegacyUnqualifiedLookup::Options options,
                          const bool isOriginallyTypeLookup);
 
-    bool resolveIsCascadingUse(const DeclContext *const dc,
-                               Optional<bool> isCascadingUse,
-                               bool onlyCareAboutFunctionBody);
+    static bool resolveIsCascadingUse(const DeclContext *const dc,
+                                      Optional<bool> isCascadingUse,
+                                      bool onlyCareAboutFunctionBody);
   };
 } // namespace
 
@@ -2007,8 +2007,6 @@ UnqualifiedLookupFactory::lookupInFunctionDecl(AbstractFunctionDecl *AFD,
     namelookup::FindLocalVal localVal(SM, Loc, Consumer);
     localVal.visit(AFD->getBody());
     if (isFinishedWithLookupNowThatIsAboutToLookForOuterResults())
-      // clang-format off
-      // TODO: when returning finished, return nulls?
       return None;
 
     if (auto *P = AFD->getImplicitSelfDecl())
@@ -2030,6 +2028,7 @@ UnqualifiedLookupFactory::lookupInFunctionDecl(AbstractFunctionDecl *AFD,
     addGenericParametersForFunction(AFD);
     if (isFinishedWithLookupNowThatIsAboutToLookForOuterResults())
       return None;
+    // clang-format off
     return PerScopeLookupState{
         false,
         fnParent,
@@ -2039,9 +2038,11 @@ UnqualifiedLookupFactory::lookupInFunctionDecl(AbstractFunctionDecl *AFD,
             // might be type checking a default argument expression and
             // performing name lookup from there), the base declaration
             // is the nominal type, not 'self'.
-            isOutsideBodyOfFunction(AFD) ? fnDeclContext : AFD, fnDeclContext,
+            isOutsideBodyOfFunction(AFD) ? fnDeclContext : AFD,
+            fnDeclContext,
             AFD->getDeclContext()),
         returnValueForIsCascadingUse};
+    // clang-format on
   }
   // Look in the generic parameters after checking our local declaration.
   addGenericParametersForFunction(AFD);