[AddressLowering] Handle copyable_to_moveonly.

The _value version of the instruction lowers to the _address version.

Author: nate-chandler

lib/SIL/Utils/InstWrappers.cpp

@@ -43,6 +43,7 @@ bool ForwardingOperation::hasSameRepresentation() const {
     return false;
 
   case SILInstructionKind::ConvertFunctionInst:
+  case SILInstructionKind::CopyableToMoveOnlyWrapperValueInst:
   case SILInstructionKind::DestructureTupleInst:
   case SILInstructionKind::DestructureStructInst:
   case SILInstructionKind::InitExistentialRefInst:

lib/SILOptimizer/Mandatory/AddressLowering.cpp

@@ -1009,6 +1009,7 @@ static Operand *getReusedStorageOperand(SILValue value) {
   default:
     break;
 
+  case ValueKind::CopyableToMoveOnlyWrapperValueInst:
   case ValueKind::MoveOnlyWrapperToCopyableValueInst:
   case ValueKind::OpenExistentialValueInst:
   case ValueKind::OpenExistentialBoxValueInst:
@@ -3410,6 +3411,19 @@ class UseRewriter : SILInstructionVisitor<UseRewriter> {
 
   void visitBeginBorrowInst(BeginBorrowInst *borrow);
 
+  void visitCopyableToMoveOnlyWrapperValueInst(
+      CopyableToMoveOnlyWrapperValueInst *inst) {
+    assert(use == getReusedStorageOperand(inst));
+    assert(inst->getType().isAddressOnly(*pass.function));
+    SILValue srcVal = inst->getOperand();
+    SILValue srcAddr = pass.valueStorageMap.getStorage(srcVal).storageAddress;
+
+    auto destAddr =
+        builder.createCopyableToMoveOnlyWrapperAddr(inst->getLoc(), srcAddr);
+
+    markRewritten(inst, destAddr);
+  }
+
   void visitEndBorrowInst(EndBorrowInst *end) {}
 
   void visitFixLifetimeInst(FixLifetimeInst *fli) {

test/SILOptimizer/address_lowering.sil

@@ -100,6 +100,7 @@ sil [ossa] @getT : $@convention(thin) <T> () -> @out T
 sil [ossa] @getKlass : $@convention(thin) () -> (@owned Klass)
 sil [ossa] @borrowKlass : $(@in_guaranteed Klass) -> ()
 sil [ossa] @borrowT : $@convention(thin) <T> (@in_guaranteed T) -> ()
+sil [ossa] @borrowMoveOnlyT : $@convention(thin) <T> (@in_guaranteed @moveOnly T) -> ()
 sil [ossa] @getPair : $@convention(thin) <T> () -> @out Pair<T>
 sil [ossa] @getOwned : $@convention(thin) <T : AnyObject> () -> (@owned T)
 sil [ossa] @takeGuaranteedObject : $@convention(thin) (@guaranteed AnyObject) -> ()
@@ -2345,6 +2346,34 @@ exit:
   return %retval : $()
 }
 
+// CHECK-LABEL: sil [ossa] @test_copyable_to_moveonlywrapper_1_owned : {{.*}} {
+// CHECK:       bb0([[TMO:%[^,]+]] :
+// CHECK:         [[T:%[^,]+]] = copyable_to_moveonlywrapper_addr [[TMO]]
+// CHECK:         destroy_addr [[T]]
+// CHECK-LABEL: } // end sil function 'test_copyable_to_moveonlywrapper_1_owned'
+sil [ossa] @test_copyable_to_moveonlywrapper_1_owned : $@convention(thin) <T> (@in T) -> () {
+entry(%t : @owned $T):
+  %tmo = copyable_to_moveonlywrapper [owned] %t : $T
+  destroy_value %tmo : $@moveOnly T
+  %retval = tuple ()
+  return %retval : $()
+}
+
+// CHECK-LABEL: sil [ossa] @test_copyable_to_moveonlywrapper_2_guaranteed : {{.*}} {
+// CHECK:       bb0([[TMO:%[^,]+]] :
+// CHECK:         [[T:%[^,]+]] = copyable_to_moveonlywrapper_addr [[TMO]]
+// CHECK:         [[BORROW_T:%[^,]+]] = function_ref @borrowMoveOnlyT
+// CHECK:         apply [[BORROW_T]]<T>([[T]])
+// CHECK-LABEL: } // end sil function 'test_copyable_to_moveonlywrapper_2_guaranteed'
+sil [ossa] @test_copyable_to_moveonlywrapper_2_guaranteed : $@convention(thin) <T> (@in_guaranteed T) -> () {
+entry(%t : @guaranteed $T):
+  %tmo = copyable_to_moveonlywrapper [guaranteed] %t : $T
+  %borrowT = function_ref @borrowMoveOnlyT : $@convention(thin) <T> (@in_guaranteed @moveOnly T) -> ()
+  apply %borrowT<T>(%tmo) : $@convention(thin) <T> (@in_guaranteed @moveOnly T) -> ()
+  %retval = tuple ()
+  return %retval : $()
+}
+
 enum PairEnum<T> {
   case it(T, T)
 }