Merge pull request #62610 from gottesmm/pr-2fc1a68995dc3f80805e722e8419a6fcf4eb25fb

[move-only] Teach move checker that captured vars are treated like inout in the relevant closures

Author: gottesmm

include/swift/AST/DiagnosticsSIL.def

@@ -733,8 +733,12 @@ ERROR(sil_moveonlychecker_guaranteed_value_consumed, none,
       "'%0' has guaranteed ownership but was consumed", (StringRef))
 ERROR(sil_moveonlychecker_guaranteed_value_captured_by_closure, none,
       "'%0' has guaranteed ownership but was consumed due to being captured by a closure", (StringRef))
+ERROR(sil_moveonlychecker_let_value_consumed_in_closure, none,
+      "'%0' consumed in closure. This is illegal since if the closure is invoked more than once the binding will be uninitialized on later invocations", (StringRef))
 ERROR(sil_moveonlychecker_inout_not_reinitialized_before_end_of_function, none,
       "'%0' consumed but not reinitialized before end of function", (StringRef))
+ERROR(sil_moveonlychecker_inout_not_reinitialized_before_end_of_closure, none,
+      "'%0' consumed in closure but not reinitialized before end of closure", (StringRef))
 ERROR(sil_moveonlychecker_value_consumed_in_a_loop, none,
       "'%0' consumed by a use in a loop", (StringRef))
 ERROR(sil_moveonlychecker_exclusivity_violation, none,

include/swift/SILOptimizer/Utils/InstructionDeleter.h

@@ -126,6 +126,10 @@ class InstructionDeleter {
 
   InstModCallbacks &getCallbacks() { return callbacks; }
 
+  void setCallbacks(const InstModCallbacks &newCallbacks) {
+    callbacks = newCallbacks;
+  }
+
   bool hadCallbackInvocation() const {
     return const_cast<InstructionDeleter *>(this)
         ->getCallbacks()

lib/SILGen/SILGenProlog.cpp

@@ -581,6 +581,9 @@ static void emitCaptureArguments(SILGenFunction &SGF,
         SILType::getPrimitiveObjectType(boxTy), VD);
     box->setClosureCapture(true);
     SILValue addr = SGF.B.createProjectBox(VD, box, 0);
+    if (addr->getType().isMoveOnly())
+      addr = SGF.B.createMarkMustCheckInst(
+          VD, addr, MarkMustCheckInst::CheckKind::NoImplicitCopy);
     SGF.VarLocs[VD] = SILGenFunction::VarLoc::get(addr, box);
     SILDebugVariable DbgVar(VD->isLet(), ArgNo);
     SGF.B.createDebugValueAddr(Loc, addr, DbgVar);

lib/SILOptimizer/Mandatory/CMakeLists.txt

@@ -24,6 +24,7 @@ target_sources(swiftSILOptimizer PRIVATE
   MovedAsyncVarDebugInfoPropagator.cpp
   MoveKillsCopyableAddressesChecker.cpp
   MoveKillsCopyableValuesChecker.cpp
+  MoveOnlyDiagnostics.cpp
   MoveOnlyObjectChecker.cpp
   MoveOnlyAddressChecker.cpp
   MoveOnlyDeinitInsertion.cpp