Merge pull request #66978 from DougGregor/init-accessors-always-part-of-memberwise-init-5.9

Author: DougGregor

lib/AST/Decl.cpp

@@ -7170,7 +7170,7 @@ bool VarDecl::isMemberwiseInitialized(bool preferDeclaredProperties) const {
   // other stored properties.
   if (hasInitAccessor()) {
     if (auto *init = getAccessor(AccessorKind::Init))
-      return init->getAttrs().hasAttribute<InitializesAttr>();
+      return true;
   }
 
   // If this is a computed property, it's not memberwise initialized unless

lib/SILGen/SILGenConstructor.cpp

@@ -360,6 +360,7 @@ static void emitImplicitValueConstructor(SILGenFunction &SGF,
   decl->collectPropertiesInitializableByInitAccessors(initializedViaAccessor);
 
   // Emit the indirect return argument, if any.
+  bool hasInitAccessors = !decl->getInitAccessorProperties().empty();
   SILValue resultSlot;
   if (selfTy.isAddress()) {
     auto &AC = SGF.getASTContext();
@@ -371,7 +372,7 @@ static void emitImplicitValueConstructor(SILGenFunction &SGF,
     VD->setSpecifier(ParamSpecifier::InOut);
     VD->setInterfaceType(selfIfaceTy);
     resultSlot = SGF.F.begin()->createFunctionArgument(selfTy, VD);
-  } else if (!initializedViaAccessor.empty()) {
+  } else if (hasInitAccessors) {
     // Allocate "self" on stack which we are going to use to
     // reference/init fields and then load to return.
     resultSlot = SGF.emitTemporaryAllocation(Loc, selfTy);
@@ -504,7 +505,7 @@ static void emitImplicitValueConstructor(SILGenFunction &SGF,
     }
 
     // Load as "take" from our stack allocation and return.
-    if (!selfTy.isAddress() && !initializedViaAccessor.empty()) {
+    if (!selfTy.isAddress() && hasInitAccessors) {
       auto resultValue = SGF.B.emitLoadValueOperation(
           Loc, resultSlot, LoadOwnershipQualifier::Take);
 

lib/Sema/CodeSynthesis.cpp

@@ -1300,10 +1300,6 @@ HasMemberwiseInitRequest::evaluate(Evaluator &evaluator,
       if (!var->isMemberwiseInitialized(/*preferDeclaredProperties=*/true))
         continue;
 
-      // If init accessors are not involved, we are done.
-      if (initializedViaAccessor.empty())
-        return true;
-
       // Check whether use of init accessors results in access to uninitialized
       // properties.
 

test/Interpreter/init_accessors.swift

@@ -385,7 +385,7 @@ func test_memberwise_ordering() {
     var _c: Int
   }
 
-  let test3 = Test3(_a: 1, _b: 2, _c: 3)
+  let test3 = Test3(_a: 1, _b: 2, pair: (1, 2), _c: 3)
   print("test-memberwise-ordering-3: \(test3)")
 }
 

test/decl/var/init_accessors.swift

@@ -425,7 +425,7 @@ func test_memberwise_ordering() {
     var _c: Int
   }
 
-  _ = Test4(_a: 0, _b: 1, _c: 2) // Ok
+  _ = Test4(_a: 0, _b: 1, pair: (1, 2), _c: 2) // Ok
 
   struct Test5 {
     var _a: Int