Make addImplicitConstructors a static method

Author: hamishknight

lib/Sema/CodeSynthesis.cpp

@@ -833,7 +833,7 @@ static bool areAllStoredPropertiesDefaultInitializable(NominalTypeDecl *decl) {
   return true;
 }
 
-static void addImplicitConstructorsToStruct(StructDecl *decl, ASTContext &ctx) {
+static void addImplicitConstructorsToStruct(StructDecl *decl) {
   assert(!decl->hasClangNode() &&
          "ClangImporter is responsible for adding implicit constructors");
   assert(!decl->hasUnreferenceableStorage() &&
@@ -884,6 +884,7 @@ static void addImplicitConstructorsToStruct(StructDecl *decl, ASTContext &ctx) {
 
   if (FoundMemberwiseInitializedProperty) {
     // Create the implicit memberwise constructor.
+    auto &ctx = decl->getASTContext();
     auto ctor = createImplicitConstructor(
         decl, ImplicitConstructorKind::Memberwise, ctx);
     decl->addMember(ctor);
@@ -893,7 +894,7 @@ static void addImplicitConstructorsToStruct(StructDecl *decl, ASTContext &ctx) {
     TypeChecker::defineDefaultConstructor(decl);
 }
 
-static void addImplicitConstructorsToClass(ClassDecl *decl, ASTContext &ctx) {
+static void addImplicitConstructorsToClass(ClassDecl *decl) {
   // Bail out if we're validating one of our constructors already;
   // we'll revisit the issue later.
   if (!decl->hasClangNode()) {
@@ -911,6 +912,7 @@ static void addImplicitConstructorsToClass(ClassDecl *decl, ASTContext &ctx) {
   // variable.
   bool FoundDesignatedInit = false;
 
+  auto &ctx = decl->getASTContext();
   SmallVector<std::pair<ValueDecl *, Type>, 4> declaredInitializers;
   llvm::SmallPtrSet<ConstructorDecl *, 4> overriddenInits;
   if (decl->hasClangNode()) {
@@ -1104,9 +1106,9 @@ void TypeChecker::addImplicitConstructors(NominalTypeDecl *decl) {
   }
 
   if (auto *structDecl = dyn_cast<StructDecl>(decl))
-    addImplicitConstructorsToStruct(structDecl, Context);
+    addImplicitConstructorsToStruct(structDecl);
   if (auto *classDecl = dyn_cast<ClassDecl>(decl))
-    addImplicitConstructorsToClass(classDecl, Context);
+    addImplicitConstructorsToClass(classDecl);
 }
 
 void TypeChecker::synthesizeMemberForLookup(NominalTypeDecl *target,

lib/Sema/TypeCheckDecl.cpp

@@ -2783,7 +2783,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     // Force lowering of stored properties.
     (void) SD->getStoredProperties();
 
-    TC.addImplicitConstructors(SD);
+    TypeChecker::addImplicitConstructors(SD);
 
     for (Decl *Member : SD->getMembers())
       visit(Member);
@@ -4408,7 +4408,7 @@ EmittedMembersRequest::evaluate(Evaluator &evaluator,
 
   // We need to add implicit initializers because they
   // affect vtable layout.
-  TC.addImplicitConstructors(CD);
+  TypeChecker::addImplicitConstructors(CD);
 
   auto forceConformance = [&](ProtocolDecl *protocol) {
     if (auto ref = TypeChecker::conformsToProtocol(

lib/Sema/TypeChecker.h

@@ -1112,7 +1112,7 @@ class TypeChecker final : public LazyResolver {
   ///
   /// Add any implicitly-defined constructors required for the given
   /// struct or class.
-  void addImplicitConstructors(NominalTypeDecl *typeDecl);
+  static void addImplicitConstructors(NominalTypeDecl *typeDecl);
 
   /// Synthesize the member with the given name on the target if applicable,
   /// i.e. if the member is synthesizable and has not yet been added to the