---

yaml
---
r: 334847
b: refs/heads/rxwei-patch-1
c: 97602a9
h: refs/heads/master
i:
  334845: f9f0a3f
  334843: 1a9abee
  334839: 75679ad
  334831: 9e2abff
  334815: aa2365b
  334783: c53bc02
  334719: ca1d823
  334591: b522177
  334335: 853ee54
  333823: 8025994

Author: davidungar

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: ca025ab8cf347de88baa9c6aa706ff3e14b22e50
+refs/heads/rxwei-patch-1: 97602a9829eccb0c25ccee9abfa31eff541aae3d
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/lib/AST/NameLookup.cpp

@@ -1401,8 +1401,23 @@ namespace {
           DebugClient->lookupOverrides(Name.getBaseName(), dcAndIsCascadingUse.first, Loc,
                                        isOriginallyTypeLookup, Results))
         return;
-
-      finishLookupRENAME(dcAndIsCascadingUse.first, dcAndIsCascadingUse.second);
+      
+      recordDependencyOnTopLevelName(dcAndIsCascadingUse.first,
+                                     Name,
+                                     dcAndIsCascadingUse.second);
+      addPrivateImports(dcAndIsCascadingUse.first);
+      if (addNamesKnownToDebugClient(dcAndIsCascadingUse.first))
+        return;
+      // If we still haven't found anything, but we do have some
+      // declarations that are "unavailable in the current Swift", drop
+      // those in.
+      if (addUnavailableInnerResults())
+        return;
+      if (lookForAModuleWithTheGivenName(dcAndIsCascadingUse.first))
+        return;
+      // Make sure we've recorded the inner-result-boundary.
+      (void)isFinishedWithLookupNowThatIsAboutToLookForOuterResults(
+                                                                    /*noMoreOuterResults=*/true);
     }
 
   private:
@@ -2017,25 +2032,30 @@ namespace {
 
       return isFinishedWithLookupNowThatIsAboutToLookForOuterResults();
     }
-
-    void finishLookupRENAME(DeclContext *const dc, const bool isCascadingUse) {
-      recordLookupOfTopLevelName(dc, Name, isCascadingUse);
-      recordedSF = dyn_cast<SourceFile>(dc);
+    
+    void recordDependencyOnTopLevelName(DeclContext *topLevelContext,
+                                        DeclName name,
+                                        bool isCascadingUse) {
+      recordLookupOfTopLevelName(topLevelContext, Name, isCascadingUse);
+      recordedSF = dyn_cast<SourceFile>(topLevelContext);
       recordedName = Name;
       recordedIsCascadingUse = isCascadingUse;
-
+    }
+    
+    void addPrivateImports(DeclContext *const dc) {
       // Add private imports to the extra search list.
       SmallVector<ModuleDecl::ImportedModule, 8> extraImports;
       if (auto FU = dyn_cast<FileUnit>(dc))
         FU->getImportedModules(extraImports, ModuleDecl::ImportFilter::Private);
 
       using namespace namelookup;
       SmallVector<ValueDecl *, 8> CurModuleResults;
-      auto resolutionKind = isOriginallyTypeLookup ? ResolutionKind::TypesOnly
+      auto resolutionKind = isOriginallyTypeLookup
+      ? ResolutionKind::TypesOnly
       : ResolutionKind::Overloadable;
       lookupInModule(&M, {}, Name, CurModuleResults, NLKind::UnqualifiedLookup,
                      resolutionKind, TypeResolver, dc, extraImports);
-
+      
       // Always perform name shadowing for type lookup.
       if (options.contains(Flags::TypeLookup)) {
         removeShadowedDecls(CurModuleResults, &M);
@@ -2046,36 +2066,37 @@ namespace {
 
       if (DebugClient)
         filterForDiscriminator(Results, DebugClient);
-      
-      // Now add any names the DebugClient knows about to the lookup.
+    }
+    
+    // Return true if done
+    bool addNamesKnownToDebugClient(DeclContext *dc) {
       if (Name.isSimpleName() && DebugClient)
         DebugClient->lookupAdditions(Name.getBaseName(), dc, Loc,
                                      isOriginallyTypeLookup, Results);
-
-      // If we've found something, we're done.
-      if (isFinishedWithLookupNowThatIsAboutToLookForOuterResults(
-              /*noMoreOuterResults=*/true))
-        return;
 
-      // If we still haven't found anything, but we do have some
-      // declarations that are "unavailable in the current Swift", drop
-      // those in.
+      // If we've found something, we're done.
+       return isFinishedWithLookupNowThatIsAboutToLookForOuterResults(
+                                                                      /*noMoreOuterResults=*/true);
+    }
+    
+    /// Return true if done
+    bool addUnavailableInnerResults() {
       Results = std::move(UnavailableInnerResults);
-      if (isFinishedWithLookupNowThatIsAboutToLookForOuterResults(
-              /*noMoreOuterResults=*/true))
-        return;
-      
+      return isFinishedWithLookupNowThatIsAboutToLookForOuterResults(
+                                                                     /*noMoreOuterResults=*/true);
+    }
+    
+    bool lookForAModuleWithTheGivenName(DeclContext *const dc) {
+      using namespace namelookup;
       if (!Name.isSimpleName())
-        return;
+        return true;
 
       // Look for a module with the given name.
       if (Name.isSimpleName(M.getName())) {
         Results.push_back(LookupResultEntry(&M));
-        if (isFinishedWithLookupNowThatIsAboutToLookForOuterResults(
-                /*noMoreOuterResults=*/true))
-          return;
+        return isFinishedWithLookupNowThatIsAboutToLookForOuterResults(
+                                                                       /*noMoreOuterResults=*/true);
       }
-      
       ModuleDecl *desiredModule = Ctx.getLoadedModule(Name.getBaseIdentifier());
       if (!desiredModule && Name == Ctx.TheBuiltinModule->getName())
         desiredModule = Ctx.TheBuiltinModule;
@@ -2089,9 +2110,7 @@ namespace {
               return true;
             });
       }
-      // Make sure we've recorded the inner-result-boundary.
-      (void)isFinishedWithLookupNowThatIsAboutToLookForOuterResults(
-          /*noMoreOuterResults=*/true);
+      return false;
     }
   };
 } // namespace