Merge pull request swiftlang#23493 from gottesmm/pr-5ede7ff49f2951b8bd547d822874421c2ceee876

Author: swift-ci

test/SILGen/without_actually_escaping.swift

@@ -1,4 +1,3 @@
-
 // RUN: %target-swift-emit-silgen -module-name without_actually_escaping %s | %FileCheck %s
 
 var escapeHatch: Any = 0
@@ -75,3 +74,29 @@ struct DontCrash {
     }
   }
 }
+
+func modifyAndPerform<T>(_ _: UnsafeMutablePointer<T>, closure: () ->()) {
+  closure()
+}
+
+// Make sure that we properly handle cases where the input closure is not
+// trivial. This means we need to copy first.
+// CHECK-LABEL: sil hidden [ossa] @$s25without_actually_escaping0A24ActuallyEscapingConflictyyF : $@convention(thin) () -> () {
+// CHECK: [[CLOSURE_1_FUN:%.*]] = function_ref @$s25without_actually_escaping0A24ActuallyEscapingConflictyyFyycfU_ :
+// CHECK: [[CLOSURE_1:%.*]] = partial_apply [callee_guaranteed] [[CLOSURE_1_FUN]](
+// CHECK: [[BORROWED_CLOSURE_1:%.*]] = begin_borrow [[CLOSURE_1]]
+// CHECK: [[COPY_BORROWED_CLOSURE_1:%.*]] = copy_value [[BORROWED_CLOSURE_1]]
+// CHECK: [[THUNK_FUNC:%.*]] = function_ref @$sIeg_Ieg_TR :
+// CHECK: [[COPY_2_BORROWED_CLOSURE_1:%.*]] = copy_value [[COPY_BORROWED_CLOSURE_1]]
+// CHECK: [[THUNK_PA:%.*]] = partial_apply [callee_guaranteed] [[THUNK_FUNC]]([[COPY_2_BORROWED_CLOSURE_1]])
+// CHECK: [[THUNK_PA_MDI:%.*]] = mark_dependence [[THUNK_PA]] : $@callee_guaranteed () -> () on [[COPY_BORROWED_CLOSURE_1]] : $@callee_guaranteed () -> ()
+// CHECK: destroy_value [[THUNK_PA_MDI]]
+// CHECK: destroy_value [[COPY_BORROWED_CLOSURE_1]]
+// CHECK: } // end sil function '$s25without_actually_escaping0A24ActuallyEscapingConflictyyF'
+func withoutActuallyEscapingConflict() {
+  var localVar = 0
+  let nestedModify = { localVar = 3 }
+  withoutActuallyEscaping(nestedModify) {
+    modifyAndPerform(&localVar, closure: $0)
+  }
+}