diff --git a/lib/SILGen/SILGenDecl.cpp b/lib/SILGen/SILGenDecl.cpp
index 06c7ba5429117..dde32f53d56b3 100644
--- a/lib/SILGen/SILGenDecl.cpp
+++ b/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;
diff --git a/lib/SILGen/SILGenFunction.h b/lib/SILGen/SILGenFunction.h
index b37ee574286e1..dbbae0cf3ad97 100644
--- a/lib/SILGen/SILGenFunction.h
+++ b/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)
diff --git a/lib/SILGen/SILGenProlog.cpp b/lib/SILGen/SILGenProlog.cpp
index 708e12c5e381a..c5e9cb37aea09 100644
--- a/lib/SILGen/SILGenProlog.cpp
+++ b/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);
diff --git a/test/SILGen/dependency_through_closure.swift b/test/SILGen/dependency_through_closure.swift
new file mode 100644
index 0000000000000..cd83c6d8c28b9
--- /dev/null
+++ b/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() }
+}
diff --git a/test/Sema/Inputs/lifetime_depend_infer.swiftinterface b/test/Sema/Inputs/lifetime_depend_infer.swiftinterface
index 9e57192c98023..8c30808dacc07 100644
--- a/test/Sema/Inputs/lifetime_depend_infer.swiftinterface
+++ b/test/Sema/Inputs/lifetime_depend_infer.swiftinterface
@@ -253,15 +253,12 @@ public struct NoncopyableSelfAccessors : ~Copyable & ~Escapable {
     _modify
   }
   
-  // FIXME: rdar://150073405 ([SILGen] support synthesized _modify on top of borrowed getters with library evolution)
-  /*
   public var neComputedBorrow: lifetime_depend_infer.NE {
     @lifetime(borrow self)
     get
     @lifetime(&self)
     set
   }
-  */
   
   public var neYieldedBorrow: lifetime_depend_infer.NE {
     @lifetime(borrow self)