Update unit tests for improved inference rules.

Author: atrick

test/SIL/implicit_lifetime_dependence.swift

@@ -88,7 +88,7 @@ struct Wrapper : ~Escapable {
     _read {
       yield _view
     }
-// CHECK: sil hidden @$s28implicit_lifetime_dependence7WrapperV4viewAA10BufferViewVvM : $@yield_once @convention(method) (@inout Wrapper) -> @lifetime(borrow 0) @yields @inout BufferView {
+// CHECK: sil hidden @$s28implicit_lifetime_dependence7WrapperV4viewAA10BufferViewVvM : $@yield_once @convention(method) (@lifetime(copy 0) @inout Wrapper) -> @lifetime(borrow 0) @yields @inout BufferView {
     @_lifetime(&self)
     _modify {
       yield &_view

test/SILOptimizer/lifetime_dependence/lifetime_dependence_borrow.swift

@@ -8,16 +8,6 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: swift_feature_Lifetimes
 
-@_unsafeNonescapableResult
-@_lifetime(copy source)
-internal func _overrideLifetime<
-  T: ~Copyable & ~Escapable, U: ~Copyable & ~Escapable
->(
-  _ dependent: consuming T, copying source: borrowing U
-) -> T {
-  dependent
-}
-
 // Some container-ish thing.
 struct CN: ~Copyable {
   let p: UnsafeRawPointer

test/SILOptimizer/lifetime_dependence/lifetime_dependence_diagnostics.swift

@@ -30,7 +30,7 @@ public struct NEInt: ~Escapable {
   var i: Int
 
   // Test yielding an address.
-  // CHECK-LABEL: sil hidden @$s4test5NEIntV5iprop{{.*}}vM : $@yield_once @convention(method) (@inout NEInt) -> @lifetime(borrow 0) @yields @inout NEInt
+  // CHECK-LABEL: sil hidden @$s4test5NEIntV5iprop{{.*}}vM : $@yield_once @convention(method) (@lifetime(copy 0) @inout NEInt) -> @lifetime(borrow 0) @yields @inout NEInt
   // CHECK: bb0(%0 : $*NEInt):
   // CHECK: [[A:%.*]] = begin_access [modify] [static] %0 : $*NEInt
   // CHECK: yield [[A]] : $*NEInt, resume bb1, unwind bb2

test/SILOptimizer/lifetime_dependence/lifetime_dependence_scope_fixup.swift

@@ -280,12 +280,12 @@ func testPointeeDependenceOnMutablePointer(p: UnsafePointer<Int64>) {
 // CHECK:   [[VAR:%.*]] = alloc_stack [lexical] [var_decl] $MutableView, var, name "span", type $MutableView
 // CHECK:   apply %{{.*}}(%0, %{{.*}}) : $@convention(method) (UnsafeMutableRawBufferPointer, @thin MutableView.Type) -> @lifetime(borrow 0) @owned MutableView
 // CHECK:   [[ACCESS1:%.*]] = begin_access [modify] [static] [[VAR]] : $*MutableView
-// CHECK:   apply %{{.*}}(%{{.*}}) : $@convention(method) (@inout MutableView) -> @lifetime(borrow 0) @owned MutableView
+// CHECK:   apply %{{.*}}(%{{.*}}) : $@convention(method) (@lifetime(copy 0) @inout MutableView) -> @lifetime(borrow 0) @owned MutableView
 // CHECK:   [[LD1:%.*]] = load %{{.*}} : $*MutableView
 // CHECK:   apply %{{.*}}([[LD1]]) : $@convention(thin) (@guaranteed MutableView) -> ()
 // CHECK:   end_access [[ACCESS1]] : $*MutableView
 // CHECK:   [[ACCESS2:%.*]] = begin_access [modify] [static] [[VAR]] : $*MutableView
-// CHECK:   apply %{{.*}}(%{{.*}}) : $@convention(method) (@inout MutableView) -> @lifetime(borrow 0) @owned MutableView
+// CHECK:   apply %{{.*}}(%{{.*}}) : $@convention(method) (@lifetime(copy 0) @inout MutableView) -> @lifetime(borrow 0) @owned MutableView
 // CHECK:   [[LD2:%.*]] = load %{{.*}} : $*MutableView
 // CHECK:   apply %{{.*}}([[LD2]]) : $@convention(thin) (@guaranteed MutableView) -> ()
 // CHECK:   end_access [[ACCESS2]] : $*MutableView

test/Sema/lifetime_attr.swift

@@ -63,9 +63,9 @@ func invalidDependenceInoutInt(_ x: inout Int) -> NE {
   NE()
 }
 
-@_lifetime(result: copy source) 
-@_lifetime(result: borrow source) // TODO: display error here
-func invalidTarget(_ result: inout NE, _ source: consuming NE) { // expected-error{{invalid duplicate target lifetime dependencies on function}}
+@_lifetime(result: copy source)   // expected-error{{duplicate lifetime dependence specifier}}
+@_lifetime(result: borrow source)
+func invalidTarget(_ result: inout NE, _ source: consuming NE) {
   result = source
 }
 
@@ -123,6 +123,7 @@ struct Wrapper : ~Escapable {
     }
     @_lifetime(self: &self)
     nonmutating _modify {// expected-error{{lifetime-dependent parameter 'self' must be 'inout'}}
+      // expected-error@-1{{cannot infer the lifetime dependence scope on a method with a ~Escapable parameter, specify '@_lifetime(borrow self)' or '@_lifetime(copy self)'}}
     }
   }
 

test/Sema/lifetime_attr_nofeature.swift

@@ -9,8 +9,7 @@ func derive(_ ne: NE) -> NE { // expected-error{{a function cannot return a ~Esc
   ne
 }
 
-func f_inout_infer(a: inout MutableRawSpan) {}
+func f_inout_infer(a: inout MutableRawSpan) {} // DEFAULT OK
 
-func f_inout_no_infer(a: inout MutableRawSpan, b: RawSpan) {}
-// expected-error @-1{{a function cannot have a ~Escapable 'inout' parameter 'a' in addition to other ~Escapable parameters}}
+func f_inout_no_infer(a: inout MutableRawSpan, b: RawSpan) {} // DEFAULT OK
 

test/Sema/lifetime_depend_nofeature.swift

@@ -11,20 +11,20 @@ struct EmptyNonEscapable: ~Escapable {} // expected-error{{an implicit initializ
 // Don't allow non-Escapable return values.
 func neReturn(span: RawSpan) -> RawSpan { span } // expected-error{{a function cannot return a ~Escapable result}}
 
-func neInout(span: inout RawSpan) {} // OK
+func neInout(span: inout RawSpan) {} // DEFAULT OK
 
-func neInoutNEParam(span: inout RawSpan, _: RawSpan) {} // expected-error{{a function cannot have a ~Escapable 'inout' parameter 'span'}}
+func neInoutNEParam(span: inout RawSpan, _: RawSpan) {} // DEFAULT OK
 
 struct S {
   func neReturn(span: RawSpan) -> RawSpan { span } // expected-error{{a method cannot return a ~Escapable result}}
 
   func neInout(span: inout RawSpan) {} // OK
 
-  func neInoutNEParam(span: inout RawSpan, _: RawSpan) {} // expected-error{{a method cannot have a ~Escapable 'inout' parameter 'span'}}
+  func neInoutNEParam(span: inout RawSpan, _: RawSpan) {} // DEFAULT OK
 
   mutating func mutatingNEInout(span: inout RawSpan) {} // OK
 
-  mutating func mutatingNEInoutParam(span: inout RawSpan, _: RawSpan) {} // expected-error{{a mutating method cannot have a ~Escapable 'inout' parameter 'span'}}
+  mutating func mutatingNEInoutParam(span: inout RawSpan, _: RawSpan) {} // DEFAULT OK
 }
 
 class C {
@@ -36,16 +36,15 @@ class C {
 extension MutableSpan {
   func method() {} // OK
 
-  mutating func mutatingMethod() {} // expected-error{{a mutating method cannot have a ~Escapable 'self'}}
+  mutating func mutatingMethod() {} // DEFAULT OK
 
   func neReturn(span: RawSpan) -> RawSpan { span } // expected-error{{a method cannot return a ~Escapable result}}
 
-  func neInout(span: inout RawSpan) {} // expected-error{{a method cannot have a ~Escapable 'inout' parameter 'span'}}
+  func neInout(span: inout RawSpan) {} // DEFAULT OK
 
-  mutating func mutatingNEInout(span: inout RawSpan) {} // expected-error{{a mutating method cannot have a ~Escapable 'self'}}
-  // expected-error@-1{{a mutating method cannot have a ~Escapable 'inout' parameter 'span'}}
+  mutating func mutatingNEInout(span: inout RawSpan) {} // DEFAULT OK
 }
 
 extension Span {
-  mutating func mutate() {} // expected-error{{a mutating method cannot have a ~Escapable 'self'}}
+  mutating func mutate() {} // DEFAULT OK
 }