Merge pull request #67224 from gottesmm/release-5.9-rdar112028837

[5.9][move-only] Ensure that copyable borrowing parameters of resilient type used by a function in the same module can be recognized by the checker

Author: gottesmm

lib/SILOptimizer/Mandatory/MoveOnlyObjectCheckerUtils.cpp

@@ -267,6 +267,22 @@ bool swift::siloptimizer::searchForCandidateObjectMarkMustChecks(
         }
       }
 
+      // Handle guaranteed parameters of a resilient type used by a resilient
+      // function inside the module in which the resilient type is defined.
+      if (auto *cvi = dyn_cast<CopyValueInst>(mmci->getOperand())) {
+        if (auto *cmi = dyn_cast<CopyableToMoveOnlyWrapperValueInst>(cvi->getOperand())) {
+          if (auto *lbi = dyn_cast<LoadBorrowInst>(cmi->getOperand())) {
+            if (auto *arg = dyn_cast<SILFunctionArgument>(lbi->getOperand())) {
+              if (arg->getKnownParameterInfo().isIndirectInGuaranteed()) {
+                moveIntroducersToProcess.insert(mmci);
+                continue;
+              }
+            }
+          }
+        }
+      }
+
+
       // If we see a mark_must_check that is marked no implicit copy that we
       // don't understand, emit a diagnostic to fail the compilation. This
       // ensures that if someone marks something no implicit copy and we fail to

test/SILOptimizer/moveonly_addresschecker_diagnostics_library_evolution.swift

@@ -17,8 +17,15 @@ public class CopyableKlass {
     var letS = NonEmptyStruct()
 }
 
+public struct CopyableStruct {
+    var k = CopyableKlass()
+}
+
 public func borrowVal(_ x: borrowing NonEmptyStruct) {}
 public func borrowVal(_ x: borrowing EmptyStruct) {}
+public func borrowVal(_ x: borrowing CopyableKlass) {}
+public func borrowVal(_ x: borrowing CopyableStruct) {}
+public func consumeVal(_ x: consuming CopyableKlass) {}
 public func consumeVal(_ x: consuming NonEmptyStruct) {}
 public func consumeVal(_ x: consuming EmptyStruct) {}
 

test/SILOptimizer/noimplicitcopy.sil

@@ -6,6 +6,10 @@
 
 class Klass {}
 
+struct CopyableStruct {
+  var k = Klass()
+}
+
 sil @classUseMoveOnlyWithoutEscaping : $@convention(thin) (@guaranteed Klass) -> ()
 
 ///////////
@@ -29,3 +33,16 @@ bb0(%0 : @noImplicitCopy @guaranteed $Klass):
   %11 = tuple ()
   return %11 : $()
 }
+
+sil [ossa] @testSimpleBorrowParameter : $@convention(thin) (@in_guaranteed CopyableStruct) -> () {
+bb0(%0 : @noImplicitCopy $*CopyableStruct):
+  %1 = load_borrow %0 : $*CopyableStruct                       // users: %7, %2
+  %2 = copyable_to_moveonlywrapper [guaranteed] %1 : $CopyableStruct // user: %3
+  %3 = copy_value %2 : $@moveOnly CopyableStruct               // user: %4
+  %4 = mark_must_check [no_consume_or_assign] %3 : $@moveOnly CopyableStruct // users: %6, %5
+  debug_value %4 : $@moveOnly CopyableStruct, let, name "x", argno 1 // id: %5
+  destroy_value %4 : $@moveOnly CopyableStruct                 // id: %6
+  end_borrow %1 : $CopyableStruct                              // id: %7
+  %8 = tuple ()                                   // user: %9
+  return %8 : $()                                 // id: %9
+}