Merge pull request #68188 from xedin/rdar-114350227-5.9

[5.9][SILGen] InitAccessors: Materialize default argument if it's required by init/setter

Author: xedin

lib/SILGen/SILGenFunction.cpp

@@ -1834,14 +1834,14 @@ void SILGenFunction::emitAssignOrInit(SILLocation loc, ManagedValue selfValue,
   // Emit the init accessor function partially applied to the base.
   SILValue initFRef = emitGlobalFunctionRef(
       loc, getAccessorDeclRef(field->getOpaqueAccessor(AccessorKind::Init)));
+
+  auto initTy = initFRef->getType().castTo<SILFunctionType>();
+
   if (!substitutions.empty()) {
     // If there are substitutions we need to emit partial apply to
     // apply substitutions to the init accessor reference type.
-    auto initTy =
-        initFRef->getType().castTo<SILFunctionType>()->substGenericArgs(
-            SGM.M, substitutions, getTypeExpansionContext());
-
-    SILFunctionConventions setterConv(initTy, SGM.M);
+    initTy = initTy->substGenericArgs(SGM.M, substitutions,
+                                      getTypeExpansionContext());
 
     // Emit partial apply without argument to produce a substituted
     // init accessor reference.
@@ -1851,6 +1851,20 @@ void SILGenFunction::emitAssignOrInit(SILLocation loc, ManagedValue selfValue,
     initFRef = emitManagedRValueWithCleanup(initPAI).getValue();
   }
 
+  // Check whether value is supposed to be passed indirectly and
+  // materialize if required.
+  {
+    SILFunctionConventions initConv(initTy, SGM.M);
+
+    auto newValueArgIdx = initConv.getSILArgIndexOfFirstParam();
+    // If we need the argument in memory, materialize an address.
+    if (initConv.getSILArgumentConvention(newValueArgIdx)
+            .isIndirectConvention() &&
+        !newValue.getType().isAddress()) {
+      newValue = newValue.materialize(*this, loc);
+    }
+  }
+
   SILValue setterFRef;
   if (auto *setter = field->getOpaqueAccessor(AccessorKind::Set)) {
     setterFRef = emitApplyOfSetterToBase(loc, SILDeclRef(setter), selfValue,

test/SILOptimizer/init_accessors_with_indirect_newValue.swift

@@ -0,0 +1,46 @@
+// RUN: %target-swift-frontend -primary-file %s -Onone -emit-sil \
+// RUN:   -enable-library-evolution \
+// RUN:   -Xllvm -sil-print-after=definite-init \
+// RUN:   -o /dev/null -module-name init_accessors 2>&1 | %FileCheck %s
+
+public class Test {
+  public enum State: Equatable {
+  case start
+  case failed(any Swift.Error)
+  case completed
+
+    public static func == (lhs: Self, rhs: Self) -> Bool { false }
+  }
+
+  private var _state: State = .start {
+    didSet { }
+  }
+
+  public private(set) var state: State = .start {
+    @storageRestrictions(initializes: _state)
+    init {
+      _state = newValue
+    }
+
+    get { _state }
+    set { _state = newValue }
+  }
+
+  // CHECK-LABEL: sil [ossa] @$s14init_accessors4TestCACycfc : $@convention(method) (@owned Test) -> @owned Test
+  //
+  // CHECK: [[DEFAULT_VALUE_INIT:%.*]] = function_ref @$s14init_accessors4TestC5stateAC5StateOvpfi : $@convention(thin) () -> @out Test.State
+  // CHECK-NEXT: [[DEFAULT_VALUE_SLOT:%.*]] = alloc_stack $Test.State
+  // CHECK-NEXT: {{.*}} = apply [[DEFAULT_VALUE_INIT]]([[DEFAULT_VALUE_SLOT]]) : $@convention(thin) () -> @out Test.State
+  // CHECK-NEXT: [[DEFAULT_VALUE:%.*]] = load [take] [[DEFAULT_VALUE_SLOT]] : $*Test.State
+  // CHECK: [[NEW_VALUE:%.*]] = alloc_stack $Test.State
+  // CHECK-NEXT: store [[DEFAULT_VALUE]] to [init] [[NEW_VALUE]] : $*Test.State
+  // CHECK: assign_or_init [init] self %0 : $Test, value [[NEW_VALUE]] : $*Test.State, init {{.*}} : $@convention(thin) (@in Test.State) -> @out Test.State, set {{.*}} : $@callee_guaranteed (@in Test.State) -> ()
+  //
+  // CHECK: [[START_STATE:%.*]] = enum $Test.State, #Test.State.start!enumelt
+  // CHECK-NEXT: [[NEW_VALUE:%.*]] = alloc_stack $Test.State
+  // CHECK-NEXT: store [[START_STATE]] to [trivial] [[NEW_VALUE]] : $*Test.State
+  // CHECK: assign_or_init [set] self %0 : $Test, value [[NEW_VALUE]] : $*Test.State, init {{.*}} : $@convention(thin) (@in Test.State) -> @out Test.State, set {{.*}} : $@callee_guaranteed (@in Test.State) -> ()
+  public init() {
+    state = .start
+  }
+}