[move-only] Do not treat accessing copyable fields of a moveonly address only type as consuming the address only type.

rdar://105106470

Author: gottesmm

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerUtils.cpp

@@ -1511,6 +1511,19 @@ bool GatherUsesVisitor::visitUse(Operand *op) {
     assert(op->getOperandNumber() == CopyAddrInst::Src &&
            "Should have dest above in memInstMust{Rei,I}nitialize");
 
+    auto leafRange = TypeTreeLeafTypeRange::get(op->get(), getRootAddress());
+    if (!leafRange)
+      return false;
+
+    // If we have a non-move only type, just treat this as a liveness use.
+    if (!copyAddr->getSrc()->getType().isMoveOnly()) {
+      LLVM_DEBUG(llvm::dbgs()
+                 << "Found copy of copyable type. Treating as liveness use! "
+                 << *user);
+      useState.livenessUses.insert({user, *leafRange});
+      return true;
+    }
+
     if (markedValue->getCheckKind() ==
         MarkMustCheckInst::CheckKind::NoConsumeOrAssign) {
       LLVM_DEBUG(llvm::dbgs()
@@ -1520,17 +1533,11 @@ bool GatherUsesVisitor::visitUse(Operand *op) {
       return true;
     }
 
-    auto leafRange = TypeTreeLeafTypeRange::get(op->get(), getRootAddress());
-    if (!leafRange)
-      return false;
-
     // TODO: Add borrow checking here like below.
 
     // TODO: Add destructure deinit checking here once address only checking is
     // completely brought up.
 
-    // TODO: Add check here that we don't error on trivial/copyable types.
-
     if (copyAddr->isTakeOfSrc()) {
       LLVM_DEBUG(llvm::dbgs() << "Found take: " << *user);
       useState.takeInsts.insert({user, *leafRange});

test/SILOptimizer/moveonly_addresschecker_diagnostics.swift

@@ -2278,13 +2278,10 @@ public func addressOnlyGenericAssignToVar5Arg2<T>(_ x: borrowing AddressOnlyGene
 // remove them when I fix it in the next commit.
 public func addressOnlyGenericAccessAccessField<T>(_ x: borrowing AddressOnlyGeneric<T>) { // expected-error {{'x' has guaranteed ownership but was consumed}}
     var x2 = x // expected-note {{consuming use here}}
-    // expected-error @-1 {{'x2' consumed by a use in a loop}}
-    // expected-error @-2 {{'x2' consumed more than once}}
     x2 = AddressOnlyGeneric<T>()
-    borrowVal(x2.copyable) // expected-note {{consuming use here}}
+    borrowVal(x2.copyable)
     for _ in 0..<1024 {
-        borrowVal(x2.copyable) // expected-note {{consuming use here}}
-        // expected-note @-1 {{consuming use here}}
+        borrowVal(x2.copyable)
     }
 }
 
@@ -2298,11 +2295,9 @@ public func addressOnlyGenericAccessAccessField2<T>(_ x: borrowing AddressOnlyGe
 }
 
 public func addressOnlyGenericAccessAccessFieldArg<T>(_ x2: inout AddressOnlyGeneric<T>) {
-    // expected-error @-1 {{'x2' consumed but not reinitialized before end of function}}
-    // expected-error @-2 {{'x2' consumed but not reinitialized before end of function}}
-    borrowVal(x2.copyable) // expected-note {{consuming use here}}
+    borrowVal(x2.copyable)
     for _ in 0..<1024 {
-        borrowVal(x2.copyable) // expected-note {{consuming use here}}
+        borrowVal(x2.copyable)
     }
 }
 
@@ -2314,12 +2309,9 @@ public func addressOnlyGenericAccessAccessFieldArg2<T>(_ x2: inout AddressOnlyGe
 }
 
 public func addressOnlyGenericAccessAccessFieldArg3<T>(_ x2: consuming AddressOnlyGeneric<T>) {
-    // expected-error @-1 {{'x2' consumed by a use in a loop}}
-    // expected-error @-2 {{'x2' consumed more than once}}
-    borrowVal(x2.copyable) // expected-note {{consuming use here}}
+    borrowVal(x2.copyable)
     for _ in 0..<1024 {
-        borrowVal(x2.copyable) // expected-note {{consuming use here}}
-        // expected-note @-1 {{consuming use here}}
+        borrowVal(x2.copyable)
     }
 }
 
@@ -2332,14 +2324,11 @@ public func addressOnlyGenericAccessAccessFieldArg4<T>(_ x2: consuming AddressOn
 
 public func addressOnlyGenericAccessConsumeField<T>(_ x: borrowing AddressOnlyGeneric<T>) { // expected-error {{'x' has guaranteed ownership but was consumed}}
     var x2 = x // expected-note {{consuming use here}}
-    // expected-error @-1 {{'x2' consumed by a use in a loop}}
-    // expected-error @-2 {{'x2' consumed more than once}}
     x2 = AddressOnlyGeneric<T>()
 
-    consumeVal(x2.copyable) // expected-note {{consuming use here}}
+    consumeVal(x2.copyable)
     for _ in 0..<1024 {
-        consumeVal(x2.copyable) // expected-note {{consuming use here}}
-        // expected-note @-1 {{consuming use here}}
+        consumeVal(x2.copyable)
     }
 }
 
@@ -2357,13 +2346,9 @@ public func addressOnlyGenericAccessConsumeField2<T>(_ x: borrowing AddressOnlyG
 }
 
 public func addressOnlyGenericAccessConsumeFieldArg<T>(_ x2: inout AddressOnlyGeneric<T>) {
-    // expected-error @-1 {{'x2' consumed but not reinitialized before end of function}}
-    // expected-error @-2 {{'x2' consumed but not reinitialized before end of function}}
-
-    consumeVal(x2.copyable) // expected-note {{consuming use here}}
-
+    consumeVal(x2.copyable)
     for _ in 0..<1024 {
-        consumeVal(x2.copyable) // expected-note {{consuming use here}}
+        consumeVal(x2.copyable)
     }
 }
 
@@ -2378,14 +2363,10 @@ public func addressOnlyGenericAccessConsumeFieldArg2<T>(_ x2: inout AddressOnlyG
 }
 
 public func addressOnlyGenericAccessConsumeFieldArg3<T>(_ x2: consuming AddressOnlyGeneric<T>) {
-    // expected-error @-1 {{'x2' consumed by a use in a loop}}
-    // expected-error @-2 {{'x2' consumed more than once}}
-
-    consumeVal(x2.copyable) // expected-note {{consuming use here}}
+    consumeVal(x2.copyable)
 
     for _ in 0..<1024 {
-        consumeVal(x2.copyable) // expected-note {{consuming use here}}
-        // expected-note @-1 {{consuming use here}}
+        consumeVal(x2.copyable)
     }
 }