Merge pull request swiftlang#28624 from CodaFi/heres-looking-up-you-kid

[NFC] Pull Semantic Member Synthesis into TypeChecker's Lookup Entrypoints

Author: CodaFi

include/swift/Sema/IDETypeChecking.h

@@ -35,6 +35,7 @@ namespace swift {
   class Expr;
   class ExtensionDecl;
   class FunctionType;
+  class LookupResult;
   class NominalTypeDecl;
   class PatternBindingDecl;
   class ProtocolDecl;
@@ -137,6 +138,9 @@ namespace swift {
   /// \returns true on success, false on error.
   bool typeCheckTopLevelCodeDecl(TopLevelCodeDecl *TLCD);
 
+  LookupResult
+  lookupSemanticMember(DeclContext *DC, Type ty, DeclName name);
+
   struct ExtensionInfo {
     // The extension with the declarations to apply.
     ExtensionDecl *Ext;

lib/AST/NameLookup.cpp

@@ -1579,34 +1579,6 @@ bool DeclContext::lookupQualified(Type type,
   return lookupQualified(nominalTypesToLookInto, member, options, decls);
 }
 
-static void installPropertyWrapperMembersIfNeeded(NominalTypeDecl *target,
-                                                  DeclName member) {
-  auto &Context = target->getASTContext();
-  auto baseName = member.getBaseName();
-  if (!member.isSimpleName() || baseName.isSpecial())
-    return;
-
-  if ((!baseName.getIdentifier().str().startswith("$") &&
-       !baseName.getIdentifier().str().startswith("_")) ||
-      baseName.getIdentifier().str().size() <= 1) {
-    return;
-  }
-
-  // $- and _-prefixed variables can be generated by properties that have
-  // attached property wrappers.
-  auto originalPropertyName =
-      Context.getIdentifier(baseName.getIdentifier().str().substr(1));
-  for (auto member : target->lookupDirect(originalPropertyName)) {
-    if (auto var = dyn_cast<VarDecl>(member)) {
-      if (var->hasAttachedPropertyWrapper()) {
-        auto sourceFile = var->getDeclContext()->getParentSourceFile();
-        if (sourceFile && sourceFile->Kind != SourceFileKind::Interface)
-          (void)var->getPropertyWrapperBackingProperty();
-      }
-    }
-  }
-}
-
 bool DeclContext::lookupQualified(ArrayRef<NominalTypeDecl *> typeDecls,
                                   DeclName member,
                                   NLOptions options,
@@ -1650,7 +1622,6 @@ bool DeclContext::lookupQualified(ArrayRef<NominalTypeDecl *> typeDecls,
 
   // Visit all of the nominal types we know about, discovering any others
   // we need along the way.
-  auto &ctx = getASTContext();
   bool wantProtocolMembers = (options & NL_ProtocolMembers);
   while (!stack.empty()) {
     auto current = stack.back();
@@ -1659,12 +1630,6 @@ bool DeclContext::lookupQualified(ArrayRef<NominalTypeDecl *> typeDecls,
     if (tracker)
       tracker->addUsedMember({current, member.getBaseName()},isLookupCascading);
 
-    // Make sure we've resolved implicit members, if we need them.
-    if (ctx.areSemanticQueriesEnabled()) {
-      current->synthesizeSemanticMembersIfNeeded(member);
-      installPropertyWrapperMembersIfNeeded(current, member);
-    }
-
     // Look for results within the current nominal type and its extensions.
     bool currentIsProtocol = isa<ProtocolDecl>(current);
     auto flags = OptionSet<NominalTypeDecl::LookupDirectFlags>();

lib/IDE/CodeCompletion.cpp

@@ -2739,22 +2739,21 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
       return;
 
     assert(CurrDeclContext);
-    SmallVector<ValueDecl *, 16> initializers;
-    if (CurrDeclContext->lookupQualified(type, DeclBaseName::createConstructor(),
-                                         NL_QualifiedDefault,
-                                         initializers)) {
-      for (auto *init : initializers) {
-        if (init->shouldHideFromEditor())
-          continue;
-        if (IsUnresolvedMember &&
-            cast<ConstructorDecl>(init)->isFailable() &&
-            !cast<ConstructorDecl>(init)->isImplicitlyUnwrappedOptional()) {
-          continue;
-        }
-        addConstructorCall(cast<ConstructorDecl>(init), Reason,
-                           dynamicLookupInfo, type, None,
-                           /*IsOnType=*/true, name);
+
+    auto results =
+        swift::lookupSemanticMember(const_cast<DeclContext *>(CurrDeclContext),
+                                    type, DeclBaseName::createConstructor());
+    for (const auto &entry : results.allResults()) {
+      auto *init = cast<ConstructorDecl>(entry.getValueDecl());
+      if (init->shouldHideFromEditor())
+        continue;
+      if (IsUnresolvedMember && init->isFailable() &&
+          !init->isImplicitlyUnwrappedOptional()) {
+        continue;
       }
+      addConstructorCall(cast<ConstructorDecl>(init), Reason,
+                         dynamicLookupInfo, type, None,
+                         /*IsOnType=*/true, name);
     }
   }
 

lib/Sema/TypeCheckDeclOverride.cpp

@@ -739,6 +739,12 @@ SmallVector<OverrideMatch, 2> OverrideMatcher::match(
   if (members.empty() || name != membersName) {
     membersName = name;
     members.clear();
+    // FIXME: This suggests we need to use TypeChecker's high-level lookup
+    // entrypoints.  But first we need one that supports additive qualified
+    // lookup.
+    for (auto *ctx : superContexts) {
+      ctx->synthesizeSemanticMembersIfNeeded(membersName);
+    }
     dc->lookupQualified(superContexts, membersName,
                         NL_QualifiedDefault, members);
   }

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -333,6 +333,12 @@ static void checkInheritanceClause(
   }
 }
 
+static void installCodingKeysIfNecessary(NominalTypeDecl *NTD) {
+  auto req =
+    ResolveImplicitMemberRequest{NTD, ImplicitMemberAction::ResolveCodingKeys};
+  (void)evaluateOrDefault(NTD->getASTContext().evaluator, req, false);
+}
+
 // Check for static properties that produce empty option sets
 // using a rawValue initializer with a value of '0'
 static void checkForEmptyOptionSet(const VarDecl *VD) {
@@ -1666,6 +1672,8 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     TypeChecker::addImplicitConstructors(SD);
 
+    installCodingKeysIfNecessary(SD);
+
     for (Decl *Member : SD->getMembers())
       visit(Member);
 

lib/Sema/TypeCheckNameLookup.cpp

@@ -22,6 +22,7 @@
 #include "swift/AST/NameLookup.h"
 #include "swift/AST/NameLookupRequests.h"
 #include "swift/AST/ProtocolConformance.h"
+#include "swift/AST/SourceFile.h"
 #include "swift/Basic/TopCollection.h"
 #include <algorithm>
 
@@ -223,11 +224,47 @@ convertToUnqualifiedLookupOptions(NameLookupOptions options) {
   return newOptions;
 }
 
+static void installPropertyWrapperMembersIfNeeded(NominalTypeDecl *target,
+                                                  DeclName member) {
+  if (!target) return;
+
+  auto &Context = target->getASTContext();
+  auto baseName = member.getBaseName();
+  if (!member.isSimpleName() || baseName.isSpecial())
+    return;
+
+  if ((!baseName.getIdentifier().str().startswith("$") &&
+       !baseName.getIdentifier().str().startswith("_")) ||
+      baseName.getIdentifier().str().size() <= 1) {
+    return;
+  }
+
+  // $- and _-prefixed variables can be generated by properties that have
+  // attached property wrappers.
+  auto originalPropertyName =
+      Context.getIdentifier(baseName.getIdentifier().str().substr(1));
+  for (auto member : target->lookupDirect(originalPropertyName)) {
+    if (auto var = dyn_cast<VarDecl>(member)) {
+      if (var->hasAttachedPropertyWrapper()) {
+        auto sourceFile = var->getDeclContext()->getParentSourceFile();
+        if (sourceFile && sourceFile->Kind != SourceFileKind::Interface)
+          (void)var->getPropertyWrapperBackingProperty();
+      }
+    }
+  }
+}
+
 LookupResult TypeChecker::lookupUnqualified(DeclContext *dc, DeclName name,
                                             SourceLoc loc,
                                             NameLookupOptions options) {
   auto ulOptions = convertToUnqualifiedLookupOptions(options);
 
+  // Make sure we've resolved implicit members, if we need them.
+  if (auto *current = dc->getInnermostTypeContext()) {
+    installPropertyWrapperMembersIfNeeded(current->getSelfNominalTypeDecl(),
+                                          name);
+  }
+
   auto &ctx = dc->getASTContext();
   auto descriptor = UnqualifiedLookupDescriptor(name, dc, loc, ulOptions);
   auto lookup = evaluateOrDefault(ctx.evaluator,
@@ -311,6 +348,12 @@ LookupResult TypeChecker::lookupMember(DeclContext *dc,
   subOptions &= ~NL_RemoveOverridden;
   subOptions &= ~NL_RemoveNonVisible;
 
+  // Make sure we've resolved implicit members, if we need them.
+  if (auto *current = type->getAnyNominal()) {
+    current->synthesizeSemanticMembersIfNeeded(name);
+    installPropertyWrapperMembersIfNeeded(current, name);
+  }
+
   LookupResultBuilder builder(result, dc, options);
   SmallVector<ValueDecl *, 4> lookupResults;
   dc->lookupQualified(type, name, subOptions, lookupResults);
@@ -385,6 +428,12 @@ LookupTypeResult TypeChecker::lookupMemberType(DeclContext *dc,
   if (options.contains(NameLookupFlags::IgnoreAccessControl))
     subOptions |= NL_IgnoreAccessControl;
 
+  // Make sure we've resolved implicit members, if we need them.
+  if (auto *current = type->getAnyNominal()) {
+    current->synthesizeSemanticMembersIfNeeded(name);
+    installPropertyWrapperMembersIfNeeded(current, name);
+  }
+
   if (!dc->lookupQualified(type, name, subOptions, decls))
     return result;
 

lib/Sema/TypeChecker.cpp

@@ -712,3 +712,8 @@ TypeChecker::getDeclTypeCheckingSemantics(ValueDecl *decl) {
 void swift::bindExtensions(SourceFile &SF) {
   ::bindExtensions(SF);
 }
+
+LookupResult
+swift::lookupSemanticMember(DeclContext *DC, Type ty, DeclName name) {
+  return TypeChecker::lookupMember(DC, ty, name, None);
+}