Fix LifetimeDependenceDiagnostics: handle mark_dependence_addr

A small typo meant that scoped dependencies modeled with mark_dependence_addr
were not diagnosed.

Author: atrick

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LifetimeDependenceDiagnostics.swift

@@ -53,7 +53,7 @@ let lifetimeDependenceDiagnosticsPass = FunctionPass(
     }
   }
   for instruction in function.instructions {
-    if let markDep = instruction as? MarkDependenceInst, markDep.isUnresolved {
+    if let markDep = instruction as? MarkDependenceInstruction, markDep.isUnresolved {
       if let lifetimeDep = LifetimeDependence(markDep, context) {
         if analyze(dependence: lifetimeDep, context) {
           // Note: This promotes the mark_dependence flag but does not invalidate analyses; preserving analyses is good,

test/SILOptimizer/lifetime_dependence/verify_diagnostics.sil

@@ -56,6 +56,9 @@ sil @getNE : $@convention(thin) (@in_guaranteed Holder) -> @lifetime(borrow addr
 sil @initTrivialHolder : $@convention(thin) () -> @out TrivialHolder
 sil @getTrivialNE : $@convention(thin) (@in_guaranteed TrivialHolder) -> @lifetime(borrow address_for_deps 0) @owned NE
 
+sil @makeHolder: $@convention(method) (@thin Holder.Type) -> @owned Holder // user: %6
+sil @getGeneric : $@convention(thin) <τ_0_0 where τ_0_0 : ~Escapable> (@guaranteed Holder, @thick τ_0_0.Type) -> @lifetime(borrow 0) @out τ_0_0 // user: %12
+
 // Test returning a owned dependence on a trivial value
 sil [ossa] @return_trivial_dependence : $@convention(thin) (@guaranteed C) -> @lifetime(borrow 0) @owned NE {
 entry(%0 : @guaranteed $C):
@@ -163,3 +166,34 @@ bb0:
   %12 = tuple ()
   return %12
 }
+
+// Test a borrowed dependency on an address
+sil [ossa] @testBorrowAddress : $@convention(thin) <T where T : ~Escapable> (@thick T.Type) -> @lifetime(immortal) @out T {
+bb0(%0 : $*T, %1 : $@thick T.Type):
+  debug_value %1, let, name "type", argno 1
+  %3 = alloc_stack [lexical] [var_decl] $Holder, var, name "holder", type $Holder
+  %4 = metatype $@thin Holder.Type
+
+  %5 = function_ref @makeHolder : $@convention(method) (@thin Holder.Type) -> @owned Holder
+  %6 = apply %5(%4) : $@convention(method) (@thin Holder.Type) -> @owned Holder
+  store %6 to [init] %3
+  %8 = alloc_stack [lexical] [var_decl] $T, let, name "result"
+  // expected-error @-1{{lifetime-dependent value escapes its scope}}
+  %9 = begin_access [read] [static] %3
+  // expected-note  @-1{{it depends on this scoped access to variable}}
+  %10 = load [copy] %9
+
+  %11 = function_ref @getGeneric : $@convention(thin) <τ_0_0 where τ_0_0 : ~Escapable> (@guaranteed Holder, @thick τ_0_0.Type) -> @lifetime(borrow 0) @out τ_0_0
+  %12 = apply %11<T>(%8, %10, %1) : $@convention(thin) <τ_0_0 where τ_0_0 : ~Escapable> (@guaranteed Holder, @thick τ_0_0.Type) -> @lifetime(borrow 0) @out τ_0_0
+  mark_dependence_addr [unresolved] %8 on %9
+  destroy_value %10
+  copy_addr %8 to [init] %0
+  // expected-note @-1{{this use causes the lifetime-dependent value to escape}}
+  end_access %9
+  destroy_addr %8
+  dealloc_stack %8
+  destroy_addr %3
+  dealloc_stack %3
+  %21 = tuple ()
+  return %21
+}

test/SILOptimizer/lifetime_dependence/verify_diagnostics.swift

@@ -36,6 +36,19 @@ struct A {}
 
 func useA(_:A){}
 
+struct NE : ~Escapable {}
+
+class C {}
+struct Holder {
+  var c: C? = nil
+}
+
+@_silgen_name("getGeneric")
+@lifetime(borrow holder)
+func getGeneric<T: ~Escapable>(_ holder: borrowing Holder, _: T.Type) -> T
+
+func mutate(_: inout Holder) {}
+
 // Test that conditionally returning an Optional succeeds.
 //
 // See scope_fixup.sil: testReturnPhi.
@@ -67,3 +80,14 @@ struct TestDeinitCallsAddressor: ~Copyable, ~Escapable {
     useA(a[])
   }
 }
+
+// Test a borrowed dependency on an address
+@lifetime(immortal)
+public func testGenericDep<T: ~Escapable>(type: T.Type) -> T {
+  let holder = Holder()
+  let result = getGeneric(holder, type)
+  // expected-error @-1{{lifetime-dependent variable 'result' escapes its scope}}
+  // expected-note  @-3{{it depends on the lifetime of variable 'holder'}}
+  return result
+  // expected-note @-1{{this use causes the lifetime-dependent value to escape}}
+}