Update tests for precise lifetime diagnostics.

Author: atrick

test/SILOptimizer/lifetime_dependence_generic.swift

@@ -2,7 +2,6 @@
 // RUN:   -o /dev/null \
 // RUN:   -verify \
 // RUN:   -sil-verify-all \
-// RUN:   -module-name test \
 // RUN:   -disable-experimental-parser-round-trip \
 // RUN:   -enable-experimental-feature NonescapableTypes \
 // RUN:   -enable-experimental-feature NoncopyableGenerics \

test/SILOptimizer/lifetime_dependence_param_fail.swift

@@ -42,10 +42,9 @@ struct NE {
   }
 }
 
-func bv_assign_inout(bv: BV, other: inout BV) {
-  other = bv // expected-error{{lifetime-dependent value escapes its scope}}
-  // expected-note @-2 {{it depends on the lifetime of argument 'bv'}}
-  // expected-note @-2 {{this use causes the lifetime-dependent value to escape}}
+func bv_assign_inout(bv: BV, other: inout BV) { // expected-error{{lifetime-dependent variable 'bv' escapes its scope}}
+  // expected-note @-1 {{it depends on the lifetime of argument 'bv'}}
+  other = bv // expected-note {{this use causes the lifetime-dependent value to escape}}
 }
 
 func bvmut_assign_inout(bv: inout BV, other: inout BV) {
@@ -60,10 +59,9 @@ func bvcons_assign_inout(bv: consuming BV, other: inout BV) {
   // expected-note @-2 {{this use causes the lifetime-dependent value to escape}}
 }
 
-func bv_assign_field(bv: BV, other: inout NE) {
-  other.bv = bv // expected-error{{lifetime-dependent value escapes its scope}}
-  // expected-note @-2 {{it depends on the lifetime of argument 'bv'}}
-  // expected-note @-2 {{this use causes the lifetime-dependent value to escape}}
+func bv_assign_field(bv: BV, other: inout NE) { // expected-error{{lifetime-dependent variable 'bv' escapes its scope}}
+  // expected-note @-1 {{it depends on the lifetime of argument 'bv'}}
+  other.bv = bv // expected-note {{this use causes the lifetime-dependent value to escape}}
 }
 
 func bvmut_assign_field(bv: inout BV, other: inout NE) {
@@ -78,10 +76,9 @@ func bvcons_assign_field(bv: consuming BV, other: inout NE) {
   // expected-note @-2 {{this use causes the lifetime-dependent value to escape}}
 }
 
-func bv_capture_escape(bv: BV) -> ()->Int {
-  return { bv.c } // expected-error{{lifetime-dependent value escapes its scope}}
-  // expected-note @-2 {{it depends on the lifetime of argument 'bv'}}
-  // expected-note @-2 {{this use causes the lifetime-dependent value to escape}}
+func bv_capture_escape(bv: BV) -> ()->Int { // expected-error{{lifetime-dependent variable 'bv' escapes its scope}}
+  // expected-note @-1 {{it depends on the lifetime of argument 'bv'}}
+  return { bv.c } // expected-note {{this use causes the lifetime-dependent value to escape}}
 }
 
 // FIXME: Our debug locations on closure captures are incorrect.
@@ -92,10 +89,9 @@ func bvcons_capture_escape(bv: consuming BV) -> ()->Int { // expected-error *{{l
   return { bv.c }
 }
 
-func bv_capture_escapelet(bv: BV) -> ()->Int {
-  let closure = { bv.c }  // expected-error{{lifetime-dependent value escapes its scope}}
-  // expected-note @-2 {{it depends on the lifetime of argument 'bv'}}
-  // expected-note @-2 {{this use causes the lifetime-dependent value to escape}}
+func bv_capture_escapelet(bv: BV) -> ()->Int { // expected-error{{lifetime-dependent variable 'bv' escapes its scope}}
+  // expected-note @-1 {{it depends on the lifetime of argument 'bv'}}
+  let closure = { bv.c } // expected-note {{this use causes the lifetime-dependent value to escape}}
   return closure
 }
 

test/SILOptimizer/lifetime_dependence_scope.swift

@@ -35,7 +35,7 @@ struct NC : ~Copyable {
   }
 }
 
-// Rewrite the mark_dependence to depende on the incoming argument rather than the nested access.
+// Rewrite the mark_dependence to depend on the incoming argument rather than the nested access.
 //
 // CHECK-LABEL: sil hidden @$s4test13bv_get_mutate9containerAA2BVVAA2NCVzYls_tF : $@convention(thin) (@inout NC) -> _scope(1) @owned BV {
 // CHECK: bb0(%0 : $*NC):

test/SILOptimizer/lifetime_dependence_scope_fixup.swift

@@ -120,9 +120,6 @@ func test3(_ a: Array<Int>) {
   }
 }
 
-/*
-// Currently fails because the lifetime dependence util isn't analyzing a
-// def-use chain involving a stack temporary
 func test4(_ a: Array<Int>) {
   a.withUnsafeBytes {
     var x = NCContainer($0, a.count)
@@ -132,7 +129,6 @@ func test4(_ a: Array<Int>) {
     consume(view)
   }
 }
-*/
 
 func test5(_ a: Array<Int>) {
   a.withUnsafeBytes {
@@ -175,7 +171,6 @@ func test7(_ a: UnsafeRawBufferPointer) {
   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>) {
@@ -187,7 +182,6 @@ func test8(_ a: Array<Int>) {
     consume(view)
   }
 }
-*/
 
 struct Wrapper : ~Escapable {
   var _view: View

test/SILOptimizer/lifetime_dependence_util.sil

@@ -151,10 +151,12 @@ entry(%0 : @owned $C, %1 : @owned $D, %2 : @guaranteed $D, %3 : $*D, %4 : $*D):
 
   %inout_arg_mark = mark_dependence [nonescaping] %inguaranteed_arg_mark : $C on %4 : $*D
   specify_test "lifetime_dependence_scope %inout_arg_mark"
+// @inout arguments are expected to have an access scope.
+// A direct dependence on an @inout argument is considered "Unknown".
+//
 // CHECK-LABEL: dependence_scope: lifetime_dependence_scope with: %inout_arg_mark
-// CHECK-NEXT: Caller:     %4 = argument of bb0 : $*D
+// CHECK-NEXT: Unknown:     %4 = argument of bb0 : $*D
 // CHECK-NEXT: Dependent:  %{{.*}} = mark_dependence [nonescaping] %{{.*}} : $C on %4 : $*D
-// CHECK-NEXT: Caller range
 // CHECK: dependence_scope: lifetime_dependence_scope with: %inout_arg_mark
 
   destroy_value %inout_arg_mark : $C