Switch UnqualifiedLookup callers over to UnqualifiedLookupRequest

hamishknight · hamishknight · commit 3aa7158d6cce · 2019-11-15T14:25:42.000-08:00
diff --git a/include/swift/AST/NameLookup.h b/include/swift/AST/NameLookup.h
@@ -156,13 +156,21 @@ class LookupResult {
     return llvm::makeArrayRef(Results).drop_front(IndexOfFirstOuterResult);
   }
 
+  /// \returns An array of both the inner and outer results.
+  ArrayRef<LookupResultEntry> allResults() const {
+    return llvm::makeArrayRef(Results);
+  }
+
   const LookupResultEntry& operator[](unsigned index) const {
     return Results[index];
   }
 
   LookupResultEntry front() const { return innerResults().front(); }
   LookupResultEntry back() const { return innerResults().back(); }
 
+  /// \returns The index of the first outer result within \c allResults().
+  size_t getIndexOfFirstOuterResult() const { return IndexOfFirstOuterResult; }
+
   /// Add a result to the set of results.
   void add(LookupResultEntry result, bool isOuter) {
     Results.push_back(result);
diff --git a/lib/AST/NameLookup.cpp b/lib/AST/NameLookup.cpp
@@ -1982,8 +1982,11 @@ directReferencesForUnqualifiedTypeLookup(DeclName name,
   if (lookupOuter == LookupOuterResults::Included)
     options |= UnqualifiedLookup::Flags::IncludeOuterResults;
 
-  UnqualifiedLookup lookup(name, dc, loc, options);
-  for (const auto &result : lookup.Results) {
+  auto &ctx = dc->getASTContext();
+  auto flags = UnqualifiedLookupFlags(options.toRaw());
+  auto lookup = evaluateOrDefault(
+      ctx.evaluator, UnqualifiedLookupRequest{name, dc, loc, flags}, {});
+  for (const auto &result : lookup.allResults()) {
     if (auto typeDecl = dyn_cast<TypeDecl>(result.getValueDecl()))
       results.push_back(typeDecl);
   }
diff --git a/lib/Immediate/REPL.cpp b/lib/Immediate/REPL.cpp
@@ -20,6 +20,7 @@
 #include "swift/AST/IRGenOptions.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/NameLookup.h"
+#include "swift/AST/NameLookupRequests.h"
 #include "swift/Basic/LLVMContext.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/IDE/REPLCodeCompletion.h"
@@ -1091,8 +1092,12 @@ class REPLEnvironment {
           ASTContext &ctx = CI.getASTContext();
           SourceFile &SF =
               MostRecentModule->getMainSourceFile(SourceFileKind::REPL);
-          UnqualifiedLookup lookup(ctx.getIdentifier(Tok.getText()), &SF);
-          for (auto result : lookup.Results) {
+          auto name = ctx.getIdentifier(Tok.getText());
+          auto flags = UnqualifiedLookupFlags();
+          auto lookup = evaluateOrDefault(
+              ctx.evaluator,
+              UnqualifiedLookupRequest{name, &SF, SourceLoc(), flags}, {});
+          for (auto result : lookup) {
             printOrDumpDecl(result.getValueDecl(), doPrint);
               
             if (auto typeDecl = dyn_cast<TypeDecl>(result.getValueDecl())) {
diff --git a/lib/ParseSIL/ParseSIL.cpp b/lib/ParseSIL/ParseSIL.cpp
@@ -15,6 +15,7 @@
 #include "swift/AST/ExistentialLayout.h"
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/NameLookup.h"
+#include "swift/AST/NameLookupRequests.h"
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/AST/SourceFile.h"
 #include "swift/AST/TypeCheckRequests.h"
@@ -1185,10 +1186,13 @@ lookupTopDecl(Parser &P, DeclBaseName Name, bool typeLookup) {
   if (typeLookup)
     options |= UnqualifiedLookup::Flags::TypeLookup;
 
-  UnqualifiedLookup DeclLookup(Name, &P.SF, SourceLoc(), options);
-  assert(DeclLookup.isSuccess() && DeclLookup.Results.size() == 1);
-  ValueDecl *VD = DeclLookup.Results.back().getValueDecl();
-  return VD;
+  auto &ctx = P.SF.getASTContext();
+  auto flags = UnqualifiedLookupFlags(options.toRaw());
+  auto lookup = evaluateOrDefault(
+      ctx.evaluator,
+      UnqualifiedLookupRequest{Name, &P.SF, SourceLoc(), flags}, {});
+  assert(lookup.size() == 1);
+  return lookup.back().getValueDecl();
 }
 
 /// Find the ValueDecl given an interface type and a member name.
diff --git a/lib/Sema/MiscDiagnostics.cpp b/lib/Sema/MiscDiagnostics.cpp
@@ -19,6 +19,7 @@
 #include "TypeCheckAvailability.h"
 #include "swift/AST/ASTWalker.h"
 #include "swift/AST/NameLookup.h"
+#include "swift/AST/NameLookupRequests.h"
 #include "swift/AST/Pattern.h"
 #include "swift/Basic/Defer.h"
 #include "swift/Basic/SourceManager.h"
@@ -531,13 +532,14 @@ static void diagSyntacticUseRestrictions(const Expr *E, const DeclContext *DC,
       }
 
       DeclContext *topLevelContext = DC->getModuleScopeContext();
-      UnqualifiedLookup lookup(VD->getBaseName(), topLevelContext,
-                               /*Loc=*/SourceLoc(),
-                               UnqualifiedLookup::Flags::KnownPrivate);
+      auto req = UnqualifiedLookupRequest{VD->getBaseName(), topLevelContext,
+                                          SourceLoc(),
+                                          UnqualifiedLookupFlags::KnownPrivate};
+      auto lookup = evaluateOrDefault(Ctx.evaluator, req, {});
 
       // Group results by module. Pick an arbitrary result from each module.
       llvm::SmallDenseMap<const ModuleDecl*,const ValueDecl*,4> resultsByModule;
-      for (auto &result : lookup.Results) {
+      for (auto &result : lookup) {
         const ValueDecl *value = result.getValueDecl();
         resultsByModule.insert(std::make_pair(value->getModuleContext(),value));
       }
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -2073,12 +2073,13 @@ void lookupReplacedDecl(DeclName replacedDeclName,
 
   auto *moduleScopeCtxt = declCtxt->getModuleScopeContext();
   if (isa<FileUnit>(declCtxt)) {
-    UnqualifiedLookup lookup(replacedDeclName, moduleScopeCtxt,
-                             attr->getLocation());
-    if (lookup.isSuccess()) {
-      for (auto entry : lookup.Results) {
-        results.push_back(entry.getValueDecl());
-      }
+    auto &ctx = declCtxt->getASTContext();
+    auto req =
+        UnqualifiedLookupRequest{replacedDeclName, moduleScopeCtxt,
+                                 attr->getLocation(), UnqualifiedLookupFlags()};
+    auto lookup = evaluateOrDefault(ctx.evaluator, req, {});
+    for (auto entry : lookup) {
+      results.push_back(entry.getValueDecl());
     }
     return;
   }
diff --git a/lib/Sema/TypeCheckNameLookup.cpp b/lib/Sema/TypeCheckNameLookup.cpp
@@ -20,6 +20,7 @@
 #include "swift/AST/ExistentialLayout.h"
 #include "swift/AST/Initializer.h"
 #include "swift/AST/NameLookup.h"
+#include "swift/AST/NameLookupRequests.h"
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/Basic/TopCollection.h"
 #include <algorithm>
@@ -225,13 +226,17 @@ convertToUnqualifiedLookupOptions(NameLookupOptions options) {
 LookupResult TypeChecker::lookupUnqualified(DeclContext *dc, DeclName name,
                                             SourceLoc loc,
                                             NameLookupOptions options) {
-  UnqualifiedLookup lookup(name, dc, loc,
-                           convertToUnqualifiedLookupOptions(options));
+  auto ulOptions = convertToUnqualifiedLookupOptions(options);
+
+  auto &ctx = dc->getASTContext();
+  auto flags = UnqualifiedLookupFlags(ulOptions.toRaw());
+  auto lookup = evaluateOrDefault(
+      ctx.evaluator, UnqualifiedLookupRequest{name, dc, loc, flags}, {});
 
   LookupResult result;
   LookupResultBuilder builder(result, dc, options);
-  for (auto idx : indices(lookup.Results)) {
-    const auto &found = lookup.Results[idx];
+  for (auto idx : indices(lookup.allResults())) {
+    const auto &found = lookup[idx];
     // Determine which type we looked through to find this result.
     Type foundInType;
 
@@ -246,7 +251,7 @@ LookupResult TypeChecker::lookupUnqualified(DeclContext *dc, DeclName name,
     }
 
     builder.add(found.getValueDecl(), found.getDeclContext(), foundInType,
-                /*isOuter=*/idx >= lookup.IndexOfFirstOuterResult);
+                /*isOuter=*/idx >= lookup.getIndexOfFirstOuterResult());
   }
   return result;
 }
@@ -255,18 +260,18 @@ LookupResult
 TypeChecker::lookupUnqualifiedType(DeclContext *dc, DeclName name,
                                    SourceLoc loc,
                                    NameLookupOptions options) {
+  auto &ctx = dc->getASTContext();
   auto ulOptions = convertToUnqualifiedLookupOptions(options) |
                    UnqualifiedLookup::Flags::TypeLookup;
   {
     // Try lookup without ProtocolMembers first.
-    UnqualifiedLookup lookup(
-        name, dc, loc,
-        ulOptions - UnqualifiedLookup::Flags::AllowProtocolMembers);
-
-    if (!lookup.Results.empty() ||
-        !options.contains(NameLookupFlags::ProtocolMembers)) {
-      return LookupResult(lookup.Results, lookup.IndexOfFirstOuterResult);
-    }
+    ulOptions -= UnqualifiedLookupFlags::AllowProtocolMembers;
+    auto flags = UnqualifiedLookupFlags(ulOptions.toRaw());
+    auto lookup = evaluateOrDefault(
+        ctx.evaluator, UnqualifiedLookupRequest{name, dc, loc, flags}, {});
+    if (!lookup.allResults().empty() ||
+        !options.contains(NameLookupFlags::ProtocolMembers))
+      return lookup;
   }
 
   {
@@ -275,11 +280,10 @@ TypeChecker::lookupUnqualifiedType(DeclContext *dc, DeclName name,
     // FIXME: Fix the problem where if NominalTypeDecl::getAllProtocols()
     // is called too early, we start resolving extensions -- even those
     // which do provide not conformances.
-    UnqualifiedLookup lookup(
-        name, dc, loc,
-        ulOptions | UnqualifiedLookup::Flags::AllowProtocolMembers);
-
-    return LookupResult(lookup.Results, lookup.IndexOfFirstOuterResult);
+    ulOptions |= UnqualifiedLookupFlags::AllowProtocolMembers;
+    auto flags = UnqualifiedLookupFlags(ulOptions.toRaw());
+    return evaluateOrDefault(
+        ctx.evaluator, UnqualifiedLookupRequest{name, dc, loc, flags}, {});
   }
 }
 
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp b/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
@@ -21,6 +21,7 @@
 #include "swift/AST/ASTPrinter.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/NameLookup.h"
+#include "swift/AST/NameLookupRequests.h"
 #include "swift/AST/SwiftNameTranslation.h"
 #include "swift/AST/GenericSignature.h"
 #include "swift/Basic/SourceManager.h"
@@ -495,10 +496,13 @@ void walkRelatedDecls(const ValueDecl *VD, const FnTy &Fn) {
 
   // FIXME: Extract useful related declarations, overloaded functions,
   // if VD is an initializer, we should extract other initializers etc.
-  // For now we use UnqualifiedLookup to fetch other declarations with the same
+  // For now we use unqualified lookup to fetch other declarations with the same
   // base name.
-  UnqualifiedLookup Lookup(VD->getBaseName(), VD->getDeclContext());
-  for (auto result : Lookup.Results) {
+  auto &ctx = VD->getASTContext();
+  auto req = UnqualifiedLookupRequest{VD->getBaseName(), VD->getDeclContext(),
+                                      SourceLoc(), UnqualifiedLookupFlags()};
+  auto lookup = evaluateOrDefault(ctx.evaluator, req, {});
+  for (auto result : lookup) {
     ValueDecl *RelatedVD = result.getValueDecl();
     if (RelatedVD->getAttrs().isUnavailable(VD->getASTContext()))
       continue;
diff --git a/tools/swift-ast-script/ASTScriptEvaluator.cpp b/tools/swift-ast-script/ASTScriptEvaluator.cpp
@@ -21,6 +21,7 @@
 #include "swift/AST/ASTWalker.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/NameLookup.h"
+#include "swift/AST/NameLookupRequests.h"
 #include "swift/Frontend/Frontend.h"
 
 using namespace swift;
@@ -114,7 +115,9 @@ bool ASTScript::execute() const {
     return true;
   }
 
-  UnqualifiedLookup viewLookup(ctx.getIdentifier("View"), swiftUI);
+  auto req = UnqualifiedLookupRequest{ctx.getIdentifier("View"), swiftUI,
+                                      SourceLoc(), UnqualifiedLookupFlags()};
+  auto viewLookup = evaluateOrDefault(ctx.evaluator, req, {});
   auto viewProtocol =
     dyn_cast_or_null<ProtocolDecl>(viewLookup.getSingleTypeResult());
   if (!viewProtocol) {
diff --git a/tools/swift-ide-test/swift-ide-test.cpp b/tools/swift-ide-test/swift-ide-test.cpp
@@ -22,6 +22,7 @@
 #include "swift/AST/DiagnosticConsumer.h"
 #include "swift/AST/DiagnosticEngine.h"
 #include "swift/AST/ImportCache.h"
+#include "swift/AST/NameLookupRequests.h"
 #include "swift/AST/PrintOptions.h"
 #include "swift/AST/RawComment.h"
 #include "swift/AST/USRGeneration.h"
@@ -2233,9 +2234,11 @@ static int doPrintDecls(const CompilerInvocation &InitInvok,
 
   for (const auto &name : DeclsToPrint) {
     ASTContext &ctx = CI.getASTContext();
-    UnqualifiedLookup lookup(ctx.getIdentifier(name),
-                             CI.getPrimarySourceFile());
-    for (auto result : lookup.Results) {
+    auto req = UnqualifiedLookupRequest{ctx.getIdentifier(name),
+                                        CI.getPrimarySourceFile(), SourceLoc(),
+                                        UnqualifiedLookupFlags()};
+    auto lookup = evaluateOrDefault(ctx.evaluator, req, {});
+    for (auto result : lookup) {
       result.getValueDecl()->print(*Printer, Options);
 
       if (auto typeDecl = dyn_cast<TypeDecl>(result.getValueDecl())) {
