[NFC] Take DeclNameRef in UnqualifiedLookup and lookupQualified()

beccadax · beccadax · commit da88512edab5 · 2019-12-11T00:55:17.000-08:00
diff --git a/include/swift/AST/ASTScope.h b/include/swift/AST/ASTScope.h
@@ -412,7 +412,7 @@ class ASTScopeImpl {
 
   /// Entry point into ASTScopeImpl-land for lookups
   static llvm::SmallVector<const ASTScopeImpl *, 0>
-  unqualifiedLookup(SourceFile *, DeclName, SourceLoc,
+  unqualifiedLookup(SourceFile *, DeclNameRef, SourceLoc,
                     const DeclContext *startingContext, DeclConsumer);
 
   static Optional<bool>
@@ -422,7 +422,7 @@ class ASTScopeImpl {
 #pragma mark - - lookup- starting point
 private:
   static const ASTScopeImpl *findStartingScopeForLookup(SourceFile *,
-                                                        const DeclName name,
+                                                        const DeclNameRef name,
                                                         const SourceLoc where,
                                                         const DeclContext *ctx);
 
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -4210,24 +4210,24 @@ ERROR(dynamic_and_library_evolution_not_supported,none,
 //------------------------------------------------------------------------------
 
 ERROR(dynamic_replacement_accessor_type_mismatch, none,
-      "replaced accessor %0's type does not match", (DeclName))
+      "replaced accessor %0's type does not match", (DeclNameRef))
 ERROR(dynamic_replacement_accessor_not_dynamic, none,
-      "replaced accessor for %0 is not marked dynamic", (DeclName))
+      "replaced accessor for %0 is not marked dynamic", (DeclNameRef))
 ERROR(dynamic_replacement_accessor_not_explicit, none,
       "replaced accessor %select{get|set|_read|_modify|willSet|didSet|unsafeAddress|addressWithOwner|addressWithNativeOwner|unsafeMutableAddress|mutableAddressWithOwner|}0 for %1 is not explicitly defined",
-      (unsigned, DeclName))
+      (unsigned, DeclNameRef))
 ERROR(dynamic_replacement_function_not_dynamic, none,
       "replaced function %0 is not marked dynamic", (DeclName))
 ERROR(dynamic_replacement_function_not_found, none,
-     "replaced function %0 could not be found", (DeclName))
+     "replaced function %0 could not be found", (DeclNameRef))
 ERROR(dynamic_replacement_accessor_not_found, none,
-      "replaced accessor for %0 could not be found", (DeclName))
+      "replaced accessor for %0 could not be found", (DeclNameRef))
 ERROR(dynamic_replacement_accessor_ambiguous, none,
-      "replaced accessor for %0 occurs in multiple places", (DeclName))
+      "replaced accessor for %0 occurs in multiple places", (DeclNameRef))
 NOTE(dynamic_replacement_accessor_ambiguous_candidate, none,
       "candidate accessor found in module %0", (DeclName))
 ERROR(dynamic_replacement_function_of_type_not_found, none,
-      "replaced function %0 of type %1 could not be found", (DeclName, Type))
+      "replaced function %0 of type %1 could not be found", (DeclNameRef, Type))
 NOTE(dynamic_replacement_found_function_of_type, none,
       "found function %0 of type %1", (DeclName, Type))
 ERROR(dynamic_replacement_not_in_extension, none,
diff --git a/include/swift/AST/NameLookup.h b/include/swift/AST/NameLookup.h
@@ -397,11 +397,11 @@ class VectorDeclConsumer : public VisibleDeclConsumer {
 class NamedDeclConsumer : public VisibleDeclConsumer {
   virtual void anchor() override;
 public:
-  DeclName name;
+  DeclNameRef name;
   SmallVectorImpl<LookupResultEntry> &results;
   bool isTypeLookup;
 
-  NamedDeclConsumer(DeclName name,
+  NamedDeclConsumer(DeclNameRef name,
                     SmallVectorImpl<LookupResultEntry> &results,
                     bool isTypeLookup)
     : name(name), results(results), isTypeLookup(isTypeLookup) {}
@@ -412,7 +412,7 @@ class NamedDeclConsumer : public VisibleDeclConsumer {
     // to avoid circular validation.
     if (isTypeLookup && !isa<TypeDecl>(VD))
       return;
-    if (VD->getFullName().matchesRef(name))
+    if (VD->getFullName().matchesRef(name.getFullName()))
       results.push_back(LookupResultEntry(VD));
   }
 };
@@ -666,7 +666,7 @@ class ASTScope {
 
   /// \return the scopes traversed
   static llvm::SmallVector<const ast_scope::ASTScopeImpl *, 0>
-  unqualifiedLookup(SourceFile *, DeclName, SourceLoc,
+  unqualifiedLookup(SourceFile *, DeclNameRef, SourceLoc,
                     const DeclContext *startingContext,
                     namelookup::AbstractASTScopeDeclConsumer &);
 
diff --git a/include/swift/AST/NameLookupRequests.h b/include/swift/AST/NameLookupRequests.h
@@ -27,6 +27,7 @@ namespace swift {
 class ClassDecl;
 class DeclContext;
 class DeclName;
+class DeclNameRef;
 class DestructorDecl;
 class GenericContext;
 class GenericParamList;
@@ -316,24 +317,15 @@ class UnqualifiedLookupDescriptor {
   using LookupOptions = OptionSet<UnqualifiedLookupFlags>;
 
 public:
-  DeclName Name;
+  DeclNameRef Name;
   DeclContext *DC;
   SourceLoc Loc;
   LookupOptions Options;
 
-  /// Transitional entry point.
-  [[deprecated]] UnqualifiedLookupDescriptor(DeclName name, DeclContext *dc,
-                              SourceLoc loc = SourceLoc(),
-                              LookupOptions options = {})
-      : Name(name), DC(dc), Loc(loc), Options(options) {}
-
-  #pragma clang diagnostic push
-  #pragma clang diagnostic ignored "-Wdeprecated-declarations"
   UnqualifiedLookupDescriptor(DeclNameRef name, DeclContext *dc,
                               SourceLoc loc = SourceLoc(),
                               LookupOptions options = {})
-      : UnqualifiedLookupDescriptor(name.getFullName(), dc, loc, options) { }
-  #pragma clang diagnostic pop
+      : Name(name), DC(dc), Loc(loc), Options(options) { }
 
   friend llvm::hash_code hash_value(const UnqualifiedLookupDescriptor &desc) {
     return llvm::hash_combine(desc.Name, desc.DC, desc.Loc,
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -833,7 +833,8 @@ DECLTYPE *ASTContext::get##NAME##Decl() const { \
       /* Note: lookupQualified() will search both the Swift overlay \
        * and the Clang module it imports. */ \
       SmallVector<ValueDecl *, 1> decls; \
-      M->lookupQualified(M, getIdentifier(#NAME), NL_OnlyTypes, decls); \
+      M->lookupQualified(M, DeclNameRef_(getIdentifier(#NAME)), NL_OnlyTypes, \
+                         decls); \
       if (decls.size() == 1 && isa<DECLTYPE>(decls[0])) { \
         auto decl = cast<DECLTYPE>(decls[0]); \
         if (isa<ProtocolDecl>(decl) || decl->getGenericParams() == nullptr) { \
diff --git a/lib/AST/ASTScope.cpp b/lib/AST/ASTScope.cpp
@@ -39,7 +39,7 @@ using namespace ast_scope;
 #pragma mark ASTScope
 
 llvm::SmallVector<const ASTScopeImpl *, 0> ASTScope::unqualifiedLookup(
-    SourceFile *SF, DeclName name, SourceLoc loc,
+    SourceFile *SF, DeclNameRef name, SourceLoc loc,
     const DeclContext *startingContext,
     namelookup::AbstractASTScopeDeclConsumer &consumer) {
   if (auto *s = SF->getASTContext().Stats)
diff --git a/lib/AST/ASTScopeLookup.cpp b/lib/AST/ASTScopeLookup.cpp
@@ -39,7 +39,7 @@ using namespace ast_scope;
 static bool isLocWithinAnInactiveClause(const SourceLoc loc, SourceFile *SF);
 
 llvm::SmallVector<const ASTScopeImpl *, 0> ASTScopeImpl::unqualifiedLookup(
-    SourceFile *sourceFile, const DeclName name, const SourceLoc loc,
+    SourceFile *sourceFile, const DeclNameRef name, const SourceLoc loc,
     const DeclContext *const startingContext, DeclConsumer consumer) {
   SmallVector<const ASTScopeImpl *, 0> history;
   const auto *start =
@@ -50,7 +50,7 @@ llvm::SmallVector<const ASTScopeImpl *, 0> ASTScopeImpl::unqualifiedLookup(
 }
 
 const ASTScopeImpl *ASTScopeImpl::findStartingScopeForLookup(
-    SourceFile *sourceFile, const DeclName name, const SourceLoc loc,
+    SourceFile *sourceFile, const DeclNameRef name, const SourceLoc loc,
     const DeclContext *const startingContext) {
   // At present, use legacy code in unqualifiedLookup.cpp to handle module-level
   // lookups
diff --git a/lib/AST/DocComment.cpp b/lib/AST/DocComment.cpp
@@ -414,7 +414,8 @@ const ValueDecl *findDefaultProvidedDeclWithDocComment(const ValueDecl *VD) {
 
   SmallVector<ValueDecl *, 2> members;
   protocol->lookupQualified(const_cast<ProtocolDecl *>(protocol),
-                            VD->getFullName(), NLOptions::NL_ProtocolMembers,
+                            DeclNameRef_(VD->getFullName()),
+                            NLOptions::NL_ProtocolMembers,
                             members);
 
   for (auto *member : members) {
diff --git a/lib/AST/UnqualifiedLookup.cpp b/lib/AST/UnqualifiedLookup.cpp
@@ -131,7 +131,7 @@ namespace {
       
     public:
       /// Do the lookups and add matches to results.
-      void findResults(const DeclName &Name, bool isCascadingUse,
+      void findResults(const DeclNameRef &Name, bool isCascadingUse,
                        NLOptions baseNLOptions, DeclContext *contextForLookup,
                        SmallVectorImpl<LookupResultEntry> &results) const;
     };
@@ -147,7 +147,7 @@ namespace {
       
     public:
       InstrumentedNamedDeclConsumer(UnqualifiedLookupFactory *factory,
-                                    DeclName name,
+                                    DeclNameRef name,
                                     SmallVectorImpl<LookupResultEntry> &results,
                                     bool isTypeLookup)
       : NamedDeclConsumer(name, results, isTypeLookup), factory(factory) {}
@@ -163,7 +163,7 @@ namespace {
     };
 #endif
     // Inputs
-    const DeclName Name;
+    const DeclNameRef Name;
     DeclContext *const DC;
     ModuleDecl &M;
     const ASTContext &Ctx;
@@ -199,7 +199,7 @@ namespace {
     
   public:
     // clang-format off
-    UnqualifiedLookupFactory(DeclName Name,
+    UnqualifiedLookupFactory(DeclNameRef Name,
                              DeclContext *const DC,
                              SourceLoc Loc,
                              Options options,
@@ -320,7 +320,7 @@ namespace {
     void setAsideUnavailableResults(size_t firstPossiblyUnavailableResult);
     
     void recordDependencyOnTopLevelName(DeclContext *topLevelContext,
-                                        DeclName name, bool isCascadingUse);
+                                        DeclNameRef name, bool isCascadingUse);
     
     void addImportedResults(DeclContext *const dc);
     
@@ -424,7 +424,7 @@ class ASTScopeDeclConsumerForUnqualifiedLookup
 
 // clang-format off
 UnqualifiedLookupFactory::UnqualifiedLookupFactory(
-                            DeclName Name,
+                            DeclNameRef Name,
                             DeclContext *const DC,
                             SourceLoc Loc,
                             Options options,
@@ -906,7 +906,7 @@ void UnqualifiedLookupFactory::addGenericParametersForFunction(
 }
 
 void UnqualifiedLookupFactory::ResultFinderForTypeContext::findResults(
-    const DeclName &Name, bool isCascadingUse, NLOptions baseNLOptions,
+    const DeclNameRef &Name, bool isCascadingUse, NLOptions baseNLOptions,
     DeclContext *contextForLookup,
     SmallVectorImpl<LookupResultEntry> &results) const {
   // An optimization:
@@ -960,8 +960,8 @@ void UnqualifiedLookupFactory::setAsideUnavailableResults(
 
 
 void UnqualifiedLookupFactory::recordDependencyOnTopLevelName(
-    DeclContext *topLevelContext, DeclName name, bool isCascadingUse) {
-  recordLookupOfTopLevelName(topLevelContext, Name, isCascadingUse);
+    DeclContext *topLevelContext, DeclNameRef name, bool isCascadingUse) {
+  recordLookupOfTopLevelName(topLevelContext, Name.getFullName(), isCascadingUse);
   recordedSF = dyn_cast<SourceFile>(topLevelContext);
   recordedIsCascadingUse = isCascadingUse;
 }
@@ -971,7 +971,7 @@ void UnqualifiedLookupFactory::addImportedResults(DeclContext *const dc) {
   SmallVector<ValueDecl *, 8> CurModuleResults;
   auto resolutionKind = isOriginallyTypeLookup ? ResolutionKind::TypesOnly
                                                : ResolutionKind::Overloadable;
-  lookupInModule(dc, Name, CurModuleResults, NLKind::UnqualifiedLookup,
+  lookupInModule(dc, Name.getFullName(), CurModuleResults, NLKind::UnqualifiedLookup,
                  resolutionKind, dc);
 
   // Always perform name shadowing for type lookup.
@@ -1014,7 +1014,7 @@ void UnqualifiedLookupFactory::lookForAModuleWithTheGivenName(
     return;
   }
   ModuleDecl *desiredModule = Ctx.getLoadedModule(Name.getBaseIdentifier());
-  if (!desiredModule && Name == Ctx.TheBuiltinModule->getName())
+  if (!desiredModule && Name.getFullName() == Ctx.TheBuiltinModule->getName())
     desiredModule = Ctx.TheBuiltinModule;
   if (desiredModule) {
     // Make sure the desired module is actually visible from the current
@@ -1135,7 +1135,7 @@ bool ASTScopeDeclConsumerForUnqualifiedLookup::consume(
   for (auto *value: values) {
     if (factory.isOriginallyTypeLookup && !isa<TypeDecl>(value))
       continue;
-    if (!value->getFullName().matchesRef(factory.Name))
+    if (!value->getFullName().matchesRef(factory.Name.getFullName()))
       continue;
 
     // In order to preserve the behavior of the existing context-based lookup,
diff --git a/lib/ClangImporter/ImportDecl.cpp b/lib/ClangImporter/ImportDecl.cpp
@@ -5017,7 +5017,7 @@ namespace {
 
         if (lookupContext) {
           SmallVector<ValueDecl *, 2> lookup;
-          dc->lookupQualified(lookupContext, name,
+          dc->lookupQualified(lookupContext, DeclNameRef_(name),
                               NL_QualifiedDefault | NL_KnownNoDependency,
                               lookup);
           bool foundMethod = false;
@@ -6396,7 +6396,7 @@ void SwiftDeclConverter::recordObjCOverride(AbstractFunctionDecl *decl) {
     return;
   // Dig out the Objective-C superclass.
   SmallVector<ValueDecl *, 4> results;
-  superDecl->lookupQualified(superDecl, decl->getFullName(),
+  superDecl->lookupQualified(superDecl, DeclNameRef_(decl->getFullName()),
                              NL_QualifiedDefault | NL_KnownNoDependency,
                              results);
   for (auto member : results) {
@@ -6469,7 +6469,7 @@ void SwiftDeclConverter::recordObjCOverride(SubscriptDecl *subscript) {
   // operation.
   SmallVector<ValueDecl *, 2> lookup;
   subscript->getModuleContext()->lookupQualified(
-      superDecl, subscript->getFullName(),
+      superDecl, DeclNameRef_(subscript->getFullName()),
       NL_QualifiedDefault | NL_KnownNoDependency, lookup);
 
   for (auto result : lookup) {
diff --git a/lib/Immediate/REPL.cpp b/lib/Immediate/REPL.cpp
@@ -1092,7 +1092,7 @@ class REPLEnvironment {
           ASTContext &ctx = CI.getASTContext();
           SourceFile &SF =
               MostRecentModule->getMainSourceFile(SourceFileKind::REPL);
-          DeclName name = ctx.getIdentifier(Tok.getText());
+          auto name = DeclNameRef_(ctx.getIdentifier(Tok.getText()));
           auto descriptor = UnqualifiedLookupDescriptor(name, &SF);
           auto lookup = evaluateOrDefault(
               ctx.evaluator, UnqualifiedLookupRequest{descriptor}, {});
diff --git a/lib/ParseSIL/ParseSIL.cpp b/lib/ParseSIL/ParseSIL.cpp
@@ -1187,7 +1187,7 @@ lookupTopDecl(Parser &P, DeclBaseName Name, bool typeLookup) {
     options |= UnqualifiedLookupFlags::TypeLookup;
 
   auto &ctx = P.SF.getASTContext();
-  auto descriptor = UnqualifiedLookupDescriptor(DeclName(Name), &P.SF);
+  auto descriptor = UnqualifiedLookupDescriptor(DeclNameRef_(Name), &P.SF);
   auto lookup = evaluateOrDefault(ctx.evaluator,
                                   UnqualifiedLookupRequest{descriptor}, {});
   assert(lookup.size() == 1);
diff --git a/lib/SIL/SILFunctionType.cpp b/lib/SIL/SILFunctionType.cpp
@@ -203,7 +203,7 @@ static CanType getKnownType(Optional<CanType> &cacheSlot, ASTContext &C,
       // lookupValue would only give us types actually declared in the overlays
       // themselves.
       SmallVector<ValueDecl *, 2> decls;
-      mod->lookupQualified(mod, C.getIdentifier(typeName),
+      mod->lookupQualified(mod, DeclNameRef_(C.getIdentifier(typeName)),
                            NL_QualifiedDefault | NL_KnownNonCascadingDependency,
                            decls);
       if (decls.size() != 1)
diff --git a/lib/SILGen/SILGenFunction.cpp b/lib/SILGen/SILGenFunction.cpp
@@ -550,7 +550,7 @@ void SILGenFunction::emitArtificialTopLevel(ClassDecl *mainClass) {
     assert(UIKit && "couldn't find UIKit objc module?!");
     SmallVector<ValueDecl *, 1> results;
     UIKit->lookupQualified(UIKit,
-                           ctx.getIdentifier("UIApplicationMain"),
+                           DeclNameRef_(ctx.getIdentifier("UIApplicationMain")),
                            NL_QualifiedDefault,
                            results);
     assert(results.size() == 1
diff --git a/lib/Sema/CSDiagnostics.cpp b/lib/Sema/CSDiagnostics.cpp
@@ -1486,7 +1486,7 @@ bool AssignmentFailure::diagnoseAsError() {
       if (auto typeContext = DC->getInnermostTypeContext()) {
         SmallVector<ValueDecl *, 2> results;
         DC->lookupQualified(typeContext->getSelfNominalTypeDecl(),
-                            VD->getFullName(), NL_QualifiedDefault, results);
+                            VD->createNameRef(), NL_QualifiedDefault, results);
 
         auto foundProperty = llvm::find_if(results, [&](ValueDecl *decl) {
           // We're looking for a settable property that is the same type as the
diff --git a/lib/Sema/LookupVisibleDecls.cpp b/lib/Sema/LookupVisibleDecls.cpp
@@ -993,8 +993,8 @@ static void lookupVisibleDynamicMemberLookupDecls(
   auto &ctx = dc->getASTContext();
 
   // Lookup the `subscript(dynamicMember:)` methods in this type.
-  auto subscriptName =
-      DeclName(ctx, DeclBaseName::createSubscript(), ctx.Id_dynamicMember);
+  auto subscriptName = DeclNameRef_(
+      DeclName(ctx, DeclBaseName::createSubscript(), ctx.Id_dynamicMember));
 
   SmallVector<ValueDecl *, 2> subscripts;
   dc->lookupQualified(baseType, subscriptName, NL_QualifiedDefault,
diff --git a/lib/Sema/MiscDiagnostics.cpp b/lib/Sema/MiscDiagnostics.cpp
@@ -533,7 +533,7 @@ static void diagSyntacticUseRestrictions(const Expr *E, const DeclContext *DC,
 
       DeclContext *topLevelContext = DC->getModuleScopeContext();
       auto descriptor = UnqualifiedLookupDescriptor(
-          DeclName(VD->getBaseName()), topLevelContext, SourceLoc(),
+          DeclNameRef_(VD->getBaseName()), topLevelContext, SourceLoc(),
           UnqualifiedLookupFlags::KnownPrivate);
       auto lookup = evaluateOrDefault(Ctx.evaluator,
                                       UnqualifiedLookupRequest{descriptor}, {});
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
diff --git a/lib/Sema/TypeCheckDeclOverride.cpp b/lib/Sema/TypeCheckDeclOverride.cpp
diff --git a/lib/Sema/TypeCheckNameLookup.cpp b/lib/Sema/TypeCheckNameLookup.cpp
diff --git a/lib/Sema/TypeCheckPropertyWrapper.cpp b/lib/Sema/TypeCheckPropertyWrapper.cpp
diff --git a/lib/Sema/TypeCheckProtocol.cpp b/lib/Sema/TypeCheckProtocol.cpp
diff --git a/lib/Serialization/Deserialization.cpp b/lib/Serialization/Deserialization.cpp
diff --git a/lib/Serialization/ModuleFile.cpp b/lib/Serialization/ModuleFile.cpp
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp b/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
