Merge pull request #64434 from gottesmm/pr-82dd301a9c8e2b6fb947d5fa43dbb8dc282ff4e2

[move-only] Change global_addr assignable_but_not_consumable accesses such that they are initialized at end of lifetime.

Author: gottesmm

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerUtils.cpp

@@ -497,6 +497,9 @@ static bool isInOutDefThatNeedsEndOfFunctionLiveness(MarkMustCheckInst *markedAd
 
     if (isa<RefElementAddrInst>(stripAccessMarkers(operand)))
       return true;
+
+    if (isa<GlobalAddrInst>(stripAccessMarkers(operand)))
+      return true;
   }
 
   return false;

test/Interpreter/moveonly.swift

@@ -1,23 +1,49 @@
-// RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all) | %FileCheck %s
+// RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all)
 
 // REQUIRES: executable_test
 
-// CHECK: MyInt: 5
-@inline(never)
-func printInt(_ x: Int) { print("MyInt: \(x)") }
+import StdlibUnittest
+
+defer { runAllTests() }
+
+var Tests = TestSuite("MoveOnlyTests")
 
 @_moveOnly
 struct FD {
-    var i = 5
+    var a  = LifetimeTracked(0)
 
     deinit {
-        printInt(i)
     }
 }
 
-func main() {
-    let x = FD()
-    let _ = x
+Tests.test("simple deinit called once") {
+    do {
+        let s = FD()
+    }
+    expectEqual(0, LifetimeTracked.instances)
 }
 
-main()
+Tests.test("ref element addr destroyed once") {
+    class CopyableKlass {
+        var fd = FD()
+    }
+
+    func assignCopyableKlass(_ x: CopyableKlass) {
+        x.fd = FD()
+    }
+
+    do {
+        let x = CopyableKlass()
+        assignCopyableKlass(x)
+    }
+    expectEqual(0, LifetimeTracked.instances)
+}
+
+var global = FD()
+
+Tests.test("global destroyed once") {
+    do {
+        global = FD()
+    }
+    expectEqual(0, LifetimeTracked.instances)    
+}

test/SILOptimizer/moveonly_addresschecker.sil

@@ -493,3 +493,29 @@ bb0(%0 : @guaranteed $ClassContainingMoveOnly):
   %11 = tuple ()
   return %11 : $()
 }
+
+// CHECK: sil [ossa] @test_global_addr_write_use : $@convention(thin) () -> () {
+// CHECK: bb0
+// CHECK-NEXT: // function_ref
+// CHECK-NEXT: function_ref
+// CHECK-NEXT: apply
+// CHECK-NEXT: global_addr
+// CHECK-NEXT: begin_access
+// CHECK-NEXT: destroy_addr
+// CHECK-NEXT: store
+// CHECK-NEXT: end_access
+// CHECK-NEXT: tuple ()
+// CHECK-NEXT: return
+// CHECK: } // end sil function 'test_global_addr_write_use'
+sil [ossa] @test_global_addr_write_use : $@convention(thin) () -> () {
+bb0:
+  %9 = function_ref @getNonTrivialStruct : $@convention(thin) () -> @owned NonTrivialStruct
+  %10 = apply %9() : $@convention(thin) () -> @owned NonTrivialStruct
+  %0 = global_addr @$s23moveonly_addresschecker9varGlobalAA16NonTrivialStructVvp : $*NonTrivialStruct
+  %1 = begin_access [modify] [dynamic] %0 : $*NonTrivialStruct
+  %2 = mark_must_check [assignable_but_not_consumable] %0 : $*NonTrivialStruct
+  store %10 to [assign] %2 : $*NonTrivialStruct
+  end_access %1 : $*NonTrivialStruct
+  %8 = tuple ()
+  return %8 : $()
+}