Fold resolveImplicitConstructors into resolveImplicitMember

Author: CodaFi

include/swift/AST/LazyResolver.h

@@ -53,9 +53,6 @@ class LazyResolver {
   virtual void resolveWitness(const NormalProtocolConformance *conformance,
                               ValueDecl *requirement) = 0;
 
-  /// Resolve any implicitly-declared constructors within the given nominal.
-  virtual void resolveImplicitConstructors(NominalTypeDecl *nominal) = 0;
-
   /// Resolve an implicitly-generated member with the given name.
   virtual void resolveImplicitMember(NominalTypeDecl *nominal, DeclName member) = 0;
 };

lib/AST/NameLookup.cpp

@@ -1572,9 +1572,6 @@ bool DeclContext::lookupQualified(ArrayRef<NominalTypeDecl *> typeDecls,
 
     // Make sure we've resolved implicit members, if we need them.
     if (typeResolver) {
-      if (member.getBaseName() == DeclBaseName::createConstructor())
-        typeResolver->resolveImplicitConstructors(current);
-
       typeResolver->resolveImplicitMember(current, member);
     }
 

lib/Sema/CodeSynthesis.cpp

@@ -1077,6 +1077,9 @@ void TypeChecker::synthesizeMemberForLookup(NominalTypeDecl *target,
                                             DeclName member) {
   auto baseName = member.getBaseName();
 
+  if (baseName == DeclBaseName::createConstructor())
+    addImplicitConstructors(target);
+
   // Checks whether the target conforms to the given protocol. If the
   // conformance is incomplete, force the conformance.
   //

lib/Sema/TypeCheckProtocol.cpp

@@ -981,7 +981,7 @@ bool WitnessChecker::findBestWitness(
   bool anyFromUnconstrainedExtension;
   numViable = 0;
 
-  // FIXME: Remove dependnecy on the lazy resolver.
+  // FIXME: Remove dependency on the lazy resolver.
   auto *TC = static_cast<TypeChecker *>(
       requirement->getASTContext().getLazyResolver());
   for (Attempt attempt = Regular; numViable == 0 && attempt != Done;
@@ -4537,7 +4537,7 @@ static void diagnosePotentialWitness(NormalProtocolConformance *conformance,
   // Describe why the witness didn't satisfy the requirement.
   WitnessChecker::RequirementEnvironmentCache oneUseCache;
   auto dc = conformance->getDeclContext();
-  // FIXME: Remove dependnecy on the lazy resolver.
+  // FIXME: Remove dependency on the lazy resolver.
   auto *TC = static_cast<TypeChecker *>(req->getASTContext().getLazyResolver());
   auto match = matchWitness(*TC, oneUseCache, conformance->getProtocol(),
                             conformance, dc, req, witness);