Merge pull request #81544 from nate-chandler/cherrypick/release/6.2/rdar139666145

6.2: [MoveOnly] Fix consume of addr with mutated field.

Author: nate-chandler

lib/SILOptimizer/Mandatory/ConsumeOperatorCopyableAddressesChecker.cpp

@@ -1340,20 +1340,22 @@ bool GatherLexicalLifetimeUseVisitor::visitUse(Operand *op,
     return true;
   }
 
-  // Then see if we have a inout_aliasable full apply site use. In that case, we
-  // are going to try and extend move checking into the partial apply using
-  // cloning to eliminate destroys or reinits.
   if (auto fas = FullApplySite::isa(op->getUser())) {
-    if (stripAccessMarkers(op->get()) != useState.address) {
+    auto convention = fas.getCaptureConvention(*op);
+    // Bail on non-inout apply uses of fields.
+    if (convention != SILArgumentConvention::Indirect_Inout &&
+        stripAccessMarkers(op->get()) != useState.address) {
       LLVM_DEBUG(
           llvm::dbgs()
           << "!!! Error! Found consuming closure use not on base address: "
           << *op->getUser());
       return false;
     }
 
-    if (fas.getCaptureConvention(*op) ==
-        SILArgumentConvention::Indirect_InoutAliasable) {
+    // Then see if we have an inout_aliasable full apply site use. In that case,
+    // we are going to try and extend move checking into the partial apply
+    // using cloning to eliminate destroys or reinits.
+    if (convention == SILArgumentConvention::Indirect_InoutAliasable) {
       // If we don't find the function, we can't handle this, so bail.
       auto *func = fas.getCalleeFunction();
       if (!func || !func->isDefer())

validation-test/SILOptimizer/rdar139666145.swift

@@ -0,0 +1,11 @@
+// RUN: %target-build-swift %s
+
+struct Box<T> { var value: T }
+
+func modify(_ string: inout String) {}
+
+func tryConsume() {
+    var box = Box(value: "")
+    modify(&box.value)
+    print(consume box)
+}