Add more lifetime_dependence test for stored properties.

Author: atrick

test/SILOptimizer/lifetime_dependence_inherit.swift

@@ -26,13 +26,26 @@ struct BV : ~Escapable {
   }
 }
 
-struct NE : ~Escapable {
+// Nonescapable wrapper.
+struct NEBV : ~Escapable {
   var bv: BV
 
   // Test lifetime inheritance through initialization.
-  init(_ bv: consuming BV) -> dependsOn(bv) Self {
+  init(_ bv: consuming BV) {
     self.bv = bv
-    return self
+  }
+
+  var view: BV {
+    _read {
+      yield bv
+    }
+    _modify {
+      yield &bv
+    }
+  }
+
+  func borrowedView() -> dependsOn(scoped self) BV {
+    bv
   }
 }
 
@@ -42,6 +55,26 @@ func bv_derive(bv: consuming BV) -> dependsOn(bv) BV {
 }
 
 // Test lifetime inheritance through stored properties.
-func ne_extract_member(ne: consuming NE) -> dependsOn(ne) BV {
-  return ne.bv
+func ne_extract_member(nebv: consuming NEBV) -> dependsOn(nebv) BV {
+  return nebv.bv
+}
+
+func ne_yield_member(nebv: consuming NEBV) -> dependsOn(nebv) BV {
+  return nebv.view
+}
+
+func bv_consume(_ x: consuming BV) {}
+
+// It is ok to consume the aggregate before the property.
+// The property's lifetime must exceed the aggregate's.
+func nebv_consume_member(nebv: consuming NEBV) {
+  let bv = nebv.bv
+  _ = consume nebv
+  bv_consume(bv)
+}
+
+func nebv_consume_after_yield(nebv: consuming NEBV) {
+  let view = nebv.view
+  _ = consume nebv
+  bv_consume(view)
 }

test/SILOptimizer/lifetime_dependence_todo.swift

@@ -11,6 +11,65 @@
 // Future tests for LifetimeDependenceDiagnostics.
 // REQUIRES: disabled
 
+struct BV : ~Escapable {
+  let p: UnsafeRawPointer
+  let i: Int
+
+  @_unsafeNonescapableResult
+  init(_ p: UnsafeRawPointer, _ i: Int) {
+    self.p = p
+    self.i = i
+  }
+}
+
+// Nonescapable wrapper.
+struct NEBV : ~Escapable {
+  var bv: BV
+
+  // Test lifetime inheritance through initialization.
+  init(_ bv: consuming BV) {
+    self.bv = bv
+  }
+
+  var view: BV {
+    _read {
+      yield bv
+    }
+    _modify {
+      yield &bv
+    }
+  }
+
+  func borrowedView() -> dependsOn(scoped self) BV {
+    bv
+  }
+}
+
+// Noncopyable, Nonescapable wrapper.
+struct NCNEBV : ~Copyable, ~Escapable {
+  var bv: BV
+
+  // Test lifetime inheritance through initialization.
+  init(_ bv: consuming BV) {
+    self.bv = bv
+  }
+
+  var view: BV {
+    _read {
+      yield bv
+    }
+    _modify {
+      yield &bv
+    }
+  }
+
+  func borrowedView() -> dependsOn(scoped self) BV {
+    bv
+  }
+}
+
+func ncnebv_consume(_: consuming NCNEBV) {}
+func bv_consume(_: consuming BV) {}
 
 // =============================================================================
 // Diagnostics that should fail.
@@ -42,3 +101,30 @@ func bvcons_capture_escapelet(bv: consuming BV) -> ()->Int {
   // expected-note @-1 {{this use causes the lifetime-dependent value to escape}}
   return closure
 }
+
+// =============================================================================
+// Can't write lit tests because move-only diagnostics are broken.
+
+func nebv_consume(_: consuming NEBV) {}
+
+// FIXME: consume operator diagnostics does not report a line number for "used here"
+func nebv_consume_borrow(nebv: NEBV) {
+  let bv = nebv.borrowedView() // expected-note {{conflicting access is here}}
+  nebv_consume(nebv) // expected-error {{overlapping accesses to 'nebv', but deinitialization requires exclusive access}}
+  bv_consume(bv)
+}
+
+// FIXME: consume operator diagnostics does not report a line number for "used here"
+func nebv_consume_borrow(nebv: consuming NEBV) { // expected-error {{'nebv' used after consume}}
+  let bv = nebv.borrowedView() // expected-note {{conflicting access is here}}
+  _ = consume nebv // expected-error {{overlapping accesses to 'nebv', but modification requires exclusive access}}
+  // expected-note @-1{{consumed here}}
+  bv_consume(bv)
+}
+
+// FIXME: consume operator diagnostics does not report a line number for "used here"
+func ncnebv_consume_borrow(ncnebv: NCNEBV) {
+  let bv = ncnebv.borrowedView() // expected-note {{conflicting access is here}}
+  ncnebv_consume(ncnebv) // expected-error {{overlapping accesses to 'nebv', but deinitialization requires exclusive access}}
+  bv_consume(bv)
+}