---

yaml
---
r: 278461
b: refs/heads/swift-5.1-old-llvm-branch
c: 6982e66
h: refs/heads/master
i:
  278459: 7de0555

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: 2f099186f9c0a4094d16c83a0eb950b1ca104081
+refs/heads/swift-5.1-old-llvm-branch: 6982e66ddf033762d860e0c5043869df297653b4
 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/include/swift/AST/NameLookup.h

@@ -372,6 +372,7 @@ void forAllVisibleModules(const DeclContext *DC, const Fn &fn) {
 bool finishLookup(const DeclContext *dc, NLOptions options,
                   SmallVectorImpl<ValueDecl *> &decls);
 
+/// Do nothing if debugClient is null.
 template <typename Result>
 void filterForDiscriminator(SmallVectorImpl<Result> &results,
                             DebuggerClient *debugClient);

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

@@ -514,6 +514,8 @@ matchDiscriminator(Identifier discriminator,
 template <typename Result>
 void namelookup::filterForDiscriminator(SmallVectorImpl<Result> &results,
                                         DebuggerClient *debugClient) {
+  if (debugClient == nullptr)
+    return;
   Identifier discriminator = debugClient->getPreferredPrivateDiscriminator();
   if (discriminator.empty())
     return;
@@ -1362,8 +1364,7 @@ bool namelookup::finishLookup(const DeclContext *dc, NLOptions options,
   if (options & NL_RemoveNonVisible)
     removeShadowedDecls(decls, M);
 
-  if (auto *debugClient = M->getDebugClient())
-    filterForDiscriminator(decls, debugClient);
+  filterForDiscriminator(decls, M->getDebugClient());
 
   // We're done. Report success/failure.
   return !decls.empty();

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

@@ -393,15 +393,20 @@ void UnqualifiedLookupFactory::fillInLookup() {
   const Optional<bool> isCascadingUseInitial =
       options.contains(Flags::KnownPrivate) ? Optional<bool>(false) : None;
   // Never perform local lookup for operators.
-  auto dcAndIsCascadingUse =
-      shouldUseASTScopeLookup()
-          ? astScopeBasedLookup(DC, isCascadingUseInitial)
-          : Name.isOperator()
-                ? operatorLookup(DC, isCascadingUseInitial)
-                : nonASTScopeBasedLookup(DC, isCascadingUseInitial);
-
-  if (!dcAndIsCascadingUse.hasValue())
-    return;
+  Optional<DCAndResolvedIsCascadingUse> dcAndIsCascadingUse;
+  if (shouldUseASTScopeLookup()) {
+    dcAndIsCascadingUse = astScopeBasedLookup(DC, isCascadingUseInitial);
+    if (!dcAndIsCascadingUse.hasValue())
+      return;
+  } else {
+    dcAndIsCascadingUse =
+        Name.isOperator() ? operatorLookup(DC, isCascadingUseInitial)
+                          : nonASTScopeBasedLookup(DC, isCascadingUseInitial);
+    if (!dcAndIsCascadingUse.hasValue())
+      return;
+    if (addLocalVariableResults(dcAndIsCascadingUse.getValue().DC))
+      return;
+  }
 
   DeclContext *const DC = dcAndIsCascadingUse.getValue().DC;
   const bool isCascadingUse = dcAndIsCascadingUse.getValue().isCascadingUse;
@@ -424,7 +429,7 @@ void UnqualifiedLookupFactory::fillInLookup() {
   if (lookForAModuleWithTheGivenName(DC))
     return;
   // Make sure we've recorded the inner-result-boundary.
-  setIndexOfFirstOuterResultIfNotSetAlready();
+  setIndexOfFirstOuterResultIfNotSetAlready(); // DMU elim?
 }
 
 bool UnqualifiedLookupFactory::shouldUseASTScopeLookup() const {
@@ -634,8 +639,7 @@ UnqualifiedLookupFactory::lookIntoDeclarationContextForASTScopeLookup(
       UnavailableInnerResults.append(begin, Results.end());
       Results.erase(begin, Results.end());
     } else {
-      if (DebugClient)
-        filterForDiscriminator(Results, DebugClient);
+      filterForDiscriminator(Results, DebugClient);
 
       setIndexOfFirstOuterResultIfNotSetAlready();
       if (isLookupDoneWithoutIncludingOuterResults())
@@ -657,9 +661,8 @@ UnqualifiedLookupFactory::operatorLookup(DeclContext *dc,
                                          Optional<bool> isCascadingUse) {
   auto *msc = dc->getModuleScopeContext();
   return DCAndResolvedIsCascadingUse{
-      addLocalVariableResults(msc) ? nullptr : msc,
-      resolveIsCascadingUse(dc, isCascadingUse,
-                            /*onlyCareAboutFunctionBody*/ true)};
+      msc, resolveIsCascadingUse(dc, isCascadingUse,
+                                 /*onlyCareAboutFunctionBody*/ true)};
 }
 
 // TODO: Unify with LookupVisibleDecls.cpp::lookupVisibleDeclsImpl
@@ -673,7 +676,7 @@ UnqualifiedLookupFactory::nonASTScopeBasedLookup(
       DCAndUnresolvedIsCascadingUse{dcArg, isCascadingUseArg});
   while (r.hasValue() && !r.getValue().whereToLook->isModuleScopeContext())
     r = lookupInOneDeclContext(r.getValue());
-  if (!r.hasValue() || addLocalVariableResults(r.getValue().whereToLook))
+  if (!r.hasValue())
     return None;
   return r.getValue().resolve(true);
 }
@@ -955,7 +958,7 @@ void UnqualifiedLookupFactory::addGenericParametersForFunction(
   }
 }
 
-// TODO enum instead of bool?
+// TODO enum instead of bool for return type?
 bool UnqualifiedLookupFactory::addLocalVariableResults(DeclContext *dc) {
   if (auto SF = dyn_cast<SourceFile>(dc)) {
     if (Loc.isValid()) {
@@ -1007,8 +1010,7 @@ bool UnqualifiedLookupFactory::handleUnavailableInnerResults(
     Results.erase(begin, Results.end());
     return false;
   }
-  if (DebugClient)
-    filterForDiscriminator(Results, DebugClient);
+  filterForDiscriminator(Results, DebugClient);
 
   setIndexOfFirstOuterResultIfNotSetAlready();
   return isLookupDoneWithoutIncludingOuterResults();
@@ -1043,8 +1045,7 @@ void UnqualifiedLookupFactory::addPrivateImports(DeclContext *const dc) {
   for (auto VD : CurModuleResults)
     Results.push_back(LookupResultEntry(VD));
 
-  if (DebugClient)
-    filterForDiscriminator(Results, DebugClient);
+  filterForDiscriminator(Results, DebugClient);
 }
 
 bool UnqualifiedLookupFactory::addNamesKnownToDebugClient(DeclContext *dc) {
@@ -1345,8 +1346,7 @@ LegacyUnqualifiedLookup::LegacyUnqualifiedLookup(DeclName Name, DeclContext *DC,
             UnavailableInnerResults.append(begin, Results.end());
             Results.erase(begin, Results.end());
           } else {
-            if (DebugClient)
-              filterForDiscriminator(Results, DebugClient);
+            filterForDiscriminator(Results, DebugClient);
 
             if (shouldReturnBasedOnResults())
               return;
@@ -1575,8 +1575,7 @@ LegacyUnqualifiedLookup::LegacyUnqualifiedLookup(DeclName Name, DeclContext *DC,
               UnavailableInnerResults.append(begin, Results.end());
               Results.erase(begin, Results.end());
             } else {
-              if (DebugClient)
-                filterForDiscriminator(Results, DebugClient);
+              filterForDiscriminator(Results, DebugClient);
 
               if (shouldReturnBasedOnResults())
                 return;
@@ -1634,7 +1633,6 @@ LegacyUnqualifiedLookup::LegacyUnqualifiedLookup(DeclName Name, DeclContext *DC,
   for (auto VD : CurModuleResults)
     Results.push_back(LookupResultEntry(VD));
 
-  if (DebugClient)
     filterForDiscriminator(Results, DebugClient);
 
   // Now add any names the DebugClient knows about to the lookup.