[MoveOnlyAddressChecker] Handle takes of copyable.

Treat a take of a copyable value as a take.

Author: nate-chandler

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerUtils.cpp

@@ -2222,16 +2222,27 @@ bool GatherUsesVisitor::visitUse(Operand *op) {
     // Before we do anything, see if this load is of a copyable field or is a
     // trivial load. If it is, then we just treat this as a liveness requiring
     // use.
-    if (li->getOwnershipQualifier() == LoadOwnershipQualifier::Trivial ||
-        isCopyableValue(li)) {
+    auto qualifier = li->getOwnershipQualifier();
+    if (qualifier == LoadOwnershipQualifier::Trivial || isCopyableValue(li)) {
       SmallVector<TypeTreeLeafTypeRange, 2> leafRanges;
       TypeTreeLeafTypeRange::get(op, getRootAddress(), leafRanges);
       if (!leafRanges.size()) {
         LLVM_DEBUG(llvm::dbgs() << "Failed to form leaf type range!\n");
         return false;
       }
       for (auto leafRange : leafRanges) {
-        useState.recordLivenessUse(user, leafRange);
+        switch (qualifier) {
+        case LoadOwnershipQualifier::Unqualified:
+          llvm_unreachable("unqualified load in ossa!?");
+        case LoadOwnershipQualifier::Take:
+          useState.recordTakeUse(user, leafRange);
+          break;
+        case LoadOwnershipQualifier::Copy:
+          LLVM_FALLTHROUGH;
+        case LoadOwnershipQualifier::Trivial:
+          useState.recordLivenessUse(user, leafRange);
+          break;
+        }
       }
       return true;
     }

test/SILOptimizer/moveonly_addresschecker_unmaximized.sil

@@ -8,6 +8,8 @@
 // RUN:     -move-only-address-checker-disable-lifetime-extension=true \
 // RUN: | %FileCheck %s
 
+import Builtin
+
 @_moveOnly
 struct M {
   deinit {}
@@ -180,3 +182,25 @@ entry(%m4_addr : $*M4):
   %retval = tuple ()
   return %retval : $()
 }
+
+struct S : ~Copyable {
+  var o: Builtin.NativeObject
+}
+
+// CHECK-LABEL: sil [ossa] @load_take_copyable : {{.*}} {
+// CHECK:       bb0([[S:%[^,]+]] :
+// CHECK:         [[O_ADDR:%[^,]+]] = struct_element_addr [[S]] : $*S, #S.o
+// CHECK:         [[O:%[^,]+]] = load [take] [[O_ADDR]]
+// CHECK:         [[OM:%[^,]+]] = move_value [[O]]
+// CHECK:         destroy_value [[OM]]
+// CHECK-LABEL: } // end sil function 'load_take_copyable'
+sil [ossa] @load_take_copyable : $@convention(thin) (@in S) -> () {
+bb0(%s_addr : $*S):
+  %s = mark_unresolved_non_copyable_value [consumable_and_assignable] %s_addr : $*S
+  %o_addr = struct_element_addr %s : $*S, #S.o
+  %o = load [take] %o_addr : $*Builtin.NativeObject
+  %om = move_value %o : $Builtin.NativeObject
+  destroy_value %om : $Builtin.NativeObject
+  %retval = tuple ()
+  return %retval : $()
+}