Update unit test

Author: meg-gupta

test/SILOptimizer/lifetime_dependence_scope_fixup.swift

@@ -19,16 +19,6 @@ struct NCContainer : ~Copyable {
   }
 }
 
-struct NEContainer : ~Escapable {
-  let ptr: UnsafeRawBufferPointer
-  let c: Int
-  @_unsafeNonescapableResult
-  init(_ ptr: UnsafeRawBufferPointer, _ c: Int) {
-    self.ptr = ptr
-    self.c = c
-  }
-}
-
 struct View : ~Escapable {
   let ptr: UnsafeRawBufferPointer
   let c: Int
@@ -45,7 +35,7 @@ struct View : ~Escapable {
     self.ptr = k.ptr
     self.c = k.c
   }
-  init(_ k: consuming NEContainer) {
+  init(_ k: consuming View) {
     self.ptr = k.ptr
     self.c = k.c
   }
@@ -67,24 +57,15 @@ struct MutableView : ~Copyable, ~Escapable {
     self.ptr = k.ptr
     self.c = k.c
   }
-  init(_ k: consuming NEContainer) {
-    self.ptr = k.ptr
-    self.c = k.c
-  }
 }
 
 func use(_ o : borrowing View) {}
 func mutate(_ x: inout NCContainer) { }
 func mutate(_ x: inout View) { }
-func mutate(_ x: inout NEContainer) { }
 func consume(_ o : consuming View) {}
 func use(_ o : borrowing MutableView) {}
 func consume(_ o : consuming MutableView) {}
 
-func getConsumingView(_ x: consuming NEContainer) -> _consume(x) View {
-  return View(x)
-}
-
 func getConsumingView(_ x: consuming View) -> _consume(x) View {
   return View(x.ptr, x.c)
 }
@@ -97,13 +78,9 @@ func getBorrowingView(_ x: borrowing NCContainer) -> _borrow(x) View {
   return View(x.ptr, x.c)
 }
 
-func getBorrowingView(_ x: borrowing NEContainer) -> _borrow(x) View {
-  return View(x.ptr, x.c)
-}
-
 func test1(_ a: Array<Int>) {
   a.withUnsafeBytes {
-    var x = NEContainer($0, a.count)
+    var x = View($0, a.count)
     mutate(&x)
     let view = getConsumingView(x)
     let newView = View(view)
@@ -161,7 +138,7 @@ func test4(_ a: Array<Int>) {
 
 func test5(_ a: Array<Int>) {
   a.withUnsafeBytes {
-    let x = NEContainer($0, a.count)
+    let x = View($0, a.count)
     let view = getBorrowingView(x)
     let anotherView = getConsumingView(view)
     use(anotherView)
@@ -192,23 +169,27 @@ func test6(_ a: Array<Int>) {
 // CHECK:   end_access [[BA]] : $*NEContainer
 // CHECK-LABEL: } // end sil function '$s31lifetime_dependence_scope_fixup5test7yySWF'
 func test7(_ a: UnsafeRawBufferPointer) {
-  var x = NEContainer(a, a.count)
+  var x = View(a, a.count)
   do {
     let view = getBorrowingView(x)
     use(view)
   }
   mutate(&x)
 }
 
+/*
+// Currently fails because the lifetime dependence util isn't analyzing a
+// def-use chain involving a stack temporary
 func test8(_ a: Array<Int>) {
   a.withUnsafeBytes {
-    var x = NEContainer($0, a.count)
+    var x = View($0, a.count)
     mutate(&x)
     let view = MutableView(x)
     use(view)
     consume(view)
   }
 }
+*/
 
 struct Wrapper : ~Escapable {
   var _view: View
@@ -235,3 +216,19 @@ func test9() {
   }
 }
 
+func getViewTuple(_ x: borrowing View) -> (View, View) {
+  return (View(x.ptr, x.c), View(x.ptr, x.c))
+}
+
+public func test10() {
+  let a = [Int](repeating: 0, count: 4)
+  a.withUnsafeBytes {
+    var x = View($0, a.count)
+    mutate(&x)
+    let view = getBorrowingView(x)
+    let tuple = getViewTuple(view)
+    use(tuple.0)
+    use(tuple.1)
+  }
+}
+