[SILGen] InitAccessors: AssignOrInit instruction should reference init accessor directly

Previously init accessor has been partially applied just like a setter but
that is no loger valid now that it operates on individual field references.

Author: xedin

lib/SIL/Verifier/SILVerifier.cpp

@@ -2722,6 +2722,12 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
     checkAssignByWrapperArgs(Src->getType(), setterConv);
   }
 
+  void checkAssigOrInitInstAccessorArgs(SILType argTy,
+                                        SILFunctionConventions &conv) {
+    unsigned argIdx = conv.getSILArgIndexOfFirstParam();
+    checkAssignByWrapperArgsRecursively(argTy, conv, argIdx);
+  }
+
   void checkAssignOrInitInst(AssignOrInitInst *AI) {
     SILValue Src = AI->getSrc();
     require(AI->getModule().getStage() == SILStage::Raw,
@@ -2732,9 +2738,10 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
     SILValue initFn = AI->getInitializer();
     CanSILFunctionType initTy = initFn->getType().castTo<SILFunctionType>();
     SILFunctionConventions initConv(initTy, AI->getModule());
-    require(initConv.getNumIndirectSILResults() == 0,
-            "init function has indirect results");
-    checkAssignByWrapperArgs(Src->getType(), initConv);
+    require(initConv.getNumIndirectSILResults() ==
+                AI->getInitializedProperties().size(),
+            "init function has invalid number of indirect results");
+    checkAssigOrInitInstAccessorArgs(Src->getType(), initConv);
 
     SILValue setterFn = AI->getSetter();
     CanSILFunctionType setterTy = setterFn->getType().castTo<SILFunctionType>();

lib/SILGen/SILGenLValue.cpp

@@ -1718,16 +1718,6 @@ namespace {
         auto initConstant = SGF.getAccessorDeclRef(initAccessor);
         SILValue initFRef = SGF.emitGlobalFunctionRef(loc, initConstant);
 
-        SmallVector<SILValue, 1> capturedArgs;
-        SILValue capturedBase = base.getValue();
-        capturedArgs.push_back(capturedBase);
-
-        PartialApplyInst *initPAI =
-          SGF.B.createPartialApply(loc, initFRef,
-                                   Substitutions, capturedArgs,
-                                   ParameterConvention::Direct_Guaranteed);
-        ManagedValue initFn = SGF.emitManagedRValueWithCleanup(initPAI);
-
         // Emit the set accessor function partially applied to the base.
         auto setterFRef = getSetterFRef();
         auto setterTy = getSetterType(setterFRef);
@@ -1736,9 +1726,9 @@ namespace {
 
         // Create the assign_or_init with the initializer and setter.
         auto value = emitValue(field, FieldType, setterTy, setterConv);
-        SGF.B.createAssignOrInit(
-            loc, value.forward(SGF), initFn.getValue(), setterFn.getValue(),
-            AssignOrInitInst::Unknown);
+        SGF.B.createAssignOrInit(loc, value.forward(SGF), initFRef,
+                                 setterFn.getValue(),
+                                 AssignOrInitInst::Unknown);
         return;
       }