Merge pull request #81878 from jckarter/addressable-scope-for-captures

SILGen: Establish an addressability scope for closure captures.

Author: jckarter

lib/SILGen/SILGenDecl.cpp

@@ -2542,6 +2542,8 @@ SILGenFunction::getLocalVariableAddressableBuffer(VarDecl *decl,
   SILValue reabstraction, allocStack, storeBorrow;
   {
     SavedInsertionPointRAII save(B);
+    ASSERT(AddressableBuffers.find(decl) != AddressableBuffers.end()
+           && "local variable did not have an addressability scope set");
     auto insertPoint = AddressableBuffers[decl].insertPoint;
     B.setInsertionPoint(insertPoint);
     auto allocStackTy = fullyAbstractedTy;

lib/SILGen/SILGenFunction.h

@@ -543,7 +543,9 @@ class LLVM_LIBRARY_VISIBILITY SILGenFunction
 
     PreparedAddressableBuffer(SILInstruction *insertPoint)
       : insertPoint(insertPoint)
-    {}
+    {
+      ASSERT(insertPoint && "null insertion point provided");
+    }
 
     PreparedAddressableBuffer(PreparedAddressableBuffer &&other)
       : insertPoint(other.insertPoint)

lib/SILGen/SILGenProlog.cpp

@@ -1406,6 +1406,7 @@ static void emitCaptureArguments(SILGenFunction &SGF,
   }
 
   SGF.VarLocs[VD] = SILGenFunction::VarLoc(arg, enforcement, box);
+  SGF.enterLocalVariableAddressableBufferScope(VD);
   SILDebugVariable DbgVar(VD->isLet(), ArgNo);
   if (auto *AllocStack = dyn_cast<AllocStackInst>(arg)) {
     AllocStack->setArgNo(ArgNo);

test/SILGen/dependency_through_closure.swift

@@ -0,0 +1,23 @@
+// RUN: %target-swift-emit-silgen -verify -enable-experimental-feature LifetimeDependence -enable-experimental-feature AddressableTypes %s
+
+// REQUIRES: swift_feature_LifetimeDependence
+// REQUIRES: swift_feature_AddressableTypes
+
+@_addressableForDependencies
+struct Owner {
+    @lifetime(borrow self)
+    func reference() -> Reference { fatalError() }
+}
+
+struct Reference: ~Escapable {
+    @lifetime(immortal)
+    init() { fatalError() }
+
+    func use() {}
+}
+
+func closure(_: () -> Void) {}
+
+func dependencyThroughClosure(from owner: borrowing Owner) {
+    closure { owner.reference().use() }
+}