[AST/Sema] TypeWrappers: Rename wrapped type memberwise initializer entry point

Author: xedin

include/swift/AST/Decl.h

@@ -3780,9 +3780,9 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
   /// by the wrapper.
   NominalTypeDecl *getTypeWrapperStorageDecl() const;
 
-  /// Get an initializer that could be used to instantiate a
+  /// Get a memberwise initializer that could be used to instantiate a
   /// type wrapped type.
-  ConstructorDecl *getTypeWrapperInitializer() const;
+  ConstructorDecl *getTypeWrappedTypeMemberwiseInitializer() const;
 
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Decl *D) {

include/swift/AST/TypeCheckRequests.h

@@ -3673,8 +3673,8 @@ class IsPropertyAccessedViaTypeWrapper
   bool isCached() const { return true; }
 };
 
-class SynthesizeTypeWrapperInitializer
-    : public SimpleRequest<SynthesizeTypeWrapperInitializer,
+class SynthesizeTypeWrappedTypeMemberwiseInitializer
+    : public SimpleRequest<SynthesizeTypeWrappedTypeMemberwiseInitializer,
                            ConstructorDecl *(NominalTypeDecl *),
                            RequestFlags::Cached> {
 public:
@@ -3689,8 +3689,8 @@ class SynthesizeTypeWrapperInitializer
   bool isCached() const { return true; }
 };
 
-class SynthesizeTypeWrapperInitializerBody
-    : public SimpleRequest<SynthesizeTypeWrapperInitializerBody,
+class SynthesizeTypeWrappedTypeMemberwiseInitializerBody
+    : public SimpleRequest<SynthesizeTypeWrappedTypeMemberwiseInitializerBody,
                            BraceStmt *(ConstructorDecl *),
                            RequestFlags::Cached> {
 public:

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -428,10 +428,10 @@ SWIFT_REQUEST(TypeChecker, SynthesizeTypeWrappedPropertySetterBody,
 SWIFT_REQUEST(TypeChecker, IsPropertyAccessedViaTypeWrapper,
               bool(VarDecl *),
               Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, SynthesizeTypeWrapperInitializer,
+SWIFT_REQUEST(TypeChecker, SynthesizeTypeWrappedTypeMemberwiseInitializer,
               ConstructorDecl *(NominalTypeDecl *),
               Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, SynthesizeTypeWrapperInitializerBody,
+SWIFT_REQUEST(TypeChecker, SynthesizeTypeWrappedTypeMemberwiseInitializerBody,
               BraceStmt *(ConstructorDecl *),
               Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, SynthesizeLocalVariableForTypeWrapperStorage,

lib/Sema/CodeSynthesis.cpp

@@ -1265,7 +1265,7 @@ void TypeChecker::addImplicitConstructors(NominalTypeDecl *decl) {
       // designated initializers, synthesize a special
       // memberwise initializer that would instantiate `$_storage`.
       if (!hasUserDefinedDesignatedInit(ctx.evaluator, decl))
-        (void)decl->getTypeWrapperInitializer();
+        (void)decl->getTypeWrappedTypeMemberwiseInitializer();
     }
 
     decl->setAddedImplicitInitializers();
@@ -1588,9 +1588,8 @@ void swift::addNonIsolatedToSynthesized(
   value->getAttrs().add(new (ctx) NonisolatedAttr(/*isImplicit=*/true));
 }
 
-ConstructorDecl *
-SynthesizeTypeWrapperInitializer::evaluate(Evaluator &evaluator,
-                                           NominalTypeDecl *wrappedType) const {
+ConstructorDecl *SynthesizeTypeWrappedTypeMemberwiseInitializer::evaluate(
+    Evaluator &evaluator, NominalTypeDecl *wrappedType) const {
   if (!wrappedType->hasTypeWrapper())
     return nullptr;
 
@@ -1601,7 +1600,8 @@ SynthesizeTypeWrapperInitializer::evaluate(Evaluator &evaluator,
   wrappedType->addMember(ctor);
 
   auto *body = evaluateOrDefault(
-      evaluator, SynthesizeTypeWrapperInitializerBody{ctor}, nullptr);
+      evaluator, SynthesizeTypeWrappedTypeMemberwiseInitializerBody{ctor},
+      nullptr);
   if (!body)
     return nullptr;
 

lib/Sema/TypeCheckTypeWrapper.cpp

@@ -151,11 +151,12 @@ VarDecl *NominalTypeDecl::getTypeWrapperProperty() const {
                            GetTypeWrapperProperty{mutableSelf}, nullptr);
 }
 
-ConstructorDecl *NominalTypeDecl::getTypeWrapperInitializer() const {
+ConstructorDecl *
+NominalTypeDecl::getTypeWrappedTypeMemberwiseInitializer() const {
   auto *mutableSelf = const_cast<NominalTypeDecl *>(this);
-  return evaluateOrDefault(getASTContext().evaluator,
-                           SynthesizeTypeWrapperInitializer{mutableSelf},
-                           nullptr);
+  return evaluateOrDefault(
+      getASTContext().evaluator,
+      SynthesizeTypeWrappedTypeMemberwiseInitializer{mutableSelf}, nullptr);
 }
 
 NominalTypeDecl *NominalTypeDecl::getTypeWrapperStorageDecl() const {
@@ -390,9 +391,8 @@ bool IsPropertyAccessedViaTypeWrapper::evaluate(Evaluator &evaluator,
   return true;
 }
 
-BraceStmt *
-SynthesizeTypeWrapperInitializerBody::evaluate(Evaluator &evaluator,
-                                               ConstructorDecl *ctor) const {
+BraceStmt *SynthesizeTypeWrappedTypeMemberwiseInitializerBody::evaluate(
+    Evaluator &evaluator, ConstructorDecl *ctor) const {
   auto &ctx = ctor->getASTContext();
   auto *parent = ctor->getDeclContext()->getSelfNominalTypeDecl();