Merge pull request #66084 from gottesmm/pr-295915eed5caee4c789ab3a532ffac4379ba1778

[move-only] Fix emission of addressonly noncopyable setter new values.

Author: gottesmm

lib/SILGen/SILGenProlog.cpp

@@ -552,8 +552,12 @@ class ArgumentInitHelper {
         substFormalParams.push_back(
           pd->toFunctionParam(pd->getType()).getCanonical(nullptr));
       };
-      for (auto paramDecl : *paramList) { addParamDecl(paramDecl); }
-      if (selfParam) { addParamDecl(selfParam); }
+      for (auto paramDecl : *paramList) {
+        addParamDecl(paramDecl);
+      }
+      if (selfParam) {
+        addParamDecl(selfParam);
+      }
 
       // Initialize the formal parameter generator.  Note that this can
       // immediately claim lowered parameters.
@@ -795,8 +799,32 @@ class ArgumentInitHelper {
                 loc, value, MarkMustCheckInst::CheckKind::NoConsumeOrAssign);
           }
         } else {
-          assert(isa<MarkMustCheckInst>(value) &&
-                 "Should have inserted mark must check inst in EmitBBArgs");
+          if (auto *fArg = dyn_cast<SILFunctionArgument>(value)) {
+            switch (fArg->getArgumentConvention()) {
+            case SILArgumentConvention::Direct_Guaranteed:
+            case SILArgumentConvention::Direct_Owned:
+            case SILArgumentConvention::Direct_Unowned:
+            case SILArgumentConvention::Indirect_Inout:
+            case SILArgumentConvention::Indirect_Out:
+            case SILArgumentConvention::Indirect_InoutAliasable:
+            case SILArgumentConvention::Pack_Inout:
+            case SILArgumentConvention::Pack_Guaranteed:
+            case SILArgumentConvention::Pack_Owned:
+            case SILArgumentConvention::Pack_Out:
+              llvm_unreachable("Should have been handled elsewhere");
+            case SILArgumentConvention::Indirect_In:
+              value = SGF.B.createMarkMustCheckInst(
+                  loc, value,
+                  MarkMustCheckInst::CheckKind::ConsumableAndAssignable);
+              break;
+            case SILArgumentConvention::Indirect_In_Guaranteed:
+              value = SGF.B.createMarkMustCheckInst(
+                  loc, value, MarkMustCheckInst::CheckKind::NoConsumeOrAssign);
+            }
+          } else {
+            assert(isa<MarkMustCheckInst>(value) &&
+                   "Should have inserted mark must check inst in EmitBBArgs");
+          }
         }
         break;
       case ValueOwnership::InOut:

test/SILGen/moveonly.swift

@@ -983,3 +983,20 @@ func testConditionallyInitializedLet() {
     borrowVal(x)
     consumeVal(x)
 }
+
+/////////////////////////////
+// MARK: AddressOnlySetter //
+/////////////////////////////
+
+struct AddressOnlySetterTester : ~Copyable {
+    var a: AddressOnlyProtocol {
+        get { fatalError() }
+
+        // CHECK-LABEL: sil hidden [ossa] @$s8moveonly23AddressOnlySetterTesterV1aAA0bC8ProtocolVvs : $@convention(method) (@in AddressOnlyProtocol, @inout AddressOnlySetterTester) -> () {
+        // CHECK: bb0([[IN_ARG:%.*]] : $*AddressOnlyProtocol, [[SELF_INOUT_ARG:%.*]] : $*AddressOnlySetterTester):
+        // CHECK: mark_must_check [consumable_and_assignable] [[IN_ARG]]
+        // CHECK: mark_must_check [consumable_and_assignable] [[SELF_INOUT_ARG]]
+        // CHECK: } // end sil function '$s8moveonly23AddressOnlySetterTesterV1aAA0bC8ProtocolVvs'
+        set { fatalError() }
+    }
+}