Unbreak tests after read / modify accessors added

asl · asl · commit 9da796c0c9fb · 2025-01-09T08:25:41.000-08:00
diff --git a/lib/Sema/TypeCheckStmt.cpp b/lib/Sema/TypeCheckStmt.cpp
@@ -1109,8 +1109,14 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
 
     SmallVector<AnyFunctionType::Yield, 4> buffer;
     auto TheFunc = AnyFunctionRef::fromDeclContext(DC);
-    auto yieldResults = TheFunc->getBodyYieldResults(buffer);
+    // Checking yields requires proper interface type. If decl is invalid, then
+    // we already emitted diagnostics elsewhere.
+    if (auto *AFD = TheFunc->getAbstractFunctionDecl()) {
+      if (AFD->isInvalid())
+        return YS;
+    }
 
+    auto yieldResults = TheFunc->getBodyYieldResults(buffer);
     auto yieldExprs = YS->getMutableYields();
     if (yieldExprs.size() != yieldResults.size()) {
       getASTContext().Diags.diagnose(YS->getYieldLoc(), diag::bad_yield_count,
diff --git a/lib/Sema/TypeCheckStorage.cpp b/lib/Sema/TypeCheckStorage.cpp
@@ -2523,7 +2523,7 @@ createCoroutineAccessorPrototype(AbstractStorageDecl *storage,
 
   // Coroutine accessors yields storage value types
   const Type retTy = YieldResultType::get(storage->getValueInterfaceType(),
-                                          kind == AccessorKind::Modify);
+                                          isYieldingMutableAccessor(kind));
 
   auto *accessor = AccessorDecl::create(
       ctx, loc, /*AccessorKeywordLoc=*/SourceLoc(), kind, storage,
diff --git a/test/Parse/coroutine_accessors_ambiguity.swift b/test/Parse/coroutine_accessors_ambiguity.swift
@@ -17,14 +17,14 @@ func read<T>(_ c : () -> T) -> T { c() }
 // disabled: ok!
 var im : Int {
   modify { // expected-enabled-error{{variable with a 'modify' accessor must also have a getter, addressor, or 'read' accessor}}
-    1 // expected-enabled-warning{{integer literal is unused}}
+    1 // expected-enabled-error{{unexpected non-void return value in void function}}
   }
 }
 
 // enabled: ok
 // disabled: ok!
 var ir : Int {
   read {
-    1 // expected-enabled-warning{{integer literal is unused}}
+    1 // expected-enabled-error{{unexpected non-void return value in void function}}
   }
 }
diff --git a/test/SILOptimizer/access_marker_verify.swift b/test/SILOptimizer/access_marker_verify.swift
@@ -787,8 +787,7 @@ class C : Abstractable {
 // CHECK-NEXT:   [[THUNKED_NEW_FN:%.*]] = partial_apply [callee_guaranteed] [[THUNK]]([[NEW_FN_CONV]])
 // CHECK-NEXT:   store [[THUNKED_NEW_FN]] to [init] [[ADDR]] :
 // CHECK-NEXT:   dealloc_stack [[TEMP]]
-// CHECK-NEXT:   end_apply [[TOKEN]]
-// CHECK-NEXT:   [[TUPLE:%.*]] = tuple ()
+// CHECK-NEXT:   [[TUPLE:%.*]] = end_apply [[TOKEN]]
 // CHECK-NEXT:   end_borrow [[SELF]] : $C
 // CHECK-NEXT:   return [[TUPLE]]
 
diff --git a/test/SILOptimizer/devirtualize_coroutine_accessors.sil b/test/SILOptimizer/devirtualize_coroutine_accessors.sil
@@ -28,7 +28,7 @@ sil [ossa] @utilize_begin_apply : $@convention(thin) () -> () {
 bb0:
   %derived = alloc_ref $Derived
   %base = upcast %derived : $Derived to $Base
-  %reader = class_method %base : $Base, #Base.x!read2 : (Base) -> () -> (), $@yield_once_2 @convention(method) (@guaranteed Base) -> @yields Int
+  %reader = class_method %base : $Base, #Base.x!read2 : (Base) -> @yield_once () -> @yields Int, $@yield_once_2 @convention(method) (@guaranteed Base) -> @yields Int
   (%value, %token, %allocation) = begin_apply %reader(%base) : $@yield_once_2 @convention(method) (@guaranteed Base) -> @yields Int
   end_apply %token as $()
   dealloc_stack %allocation : $*Builtin.SILToken
diff --git a/test/SILOptimizer/package-cmo-deserialize-for-external-client.swift b/test/SILOptimizer/package-cmo-deserialize-for-external-client.swift
@@ -30,17 +30,17 @@
 // CHECK-INPKG: sil_vtable Pub {
 // CHECK-INPKG: #Pub.pubVar!getter: (Pub) -> () -> Int : @$s3Lib3PubC6pubVarSivg  // Pub.pubVar.getter
 // CHECK-INPKG: #Pub.pubVar!setter: (Pub) -> (Int) -> () : @$s3Lib3PubC6pubVarSivs  // Pub.pubVar.setter
-// CHECK-INPKG: #Pub.pubVar!modify: (Pub) -> () -> () : @$s3Lib3PubC6pubVarSivM  // Pub.pubVar.modify
+// CHECK-INPKG: #Pub.pubVar!modify: (Pub) -> @yield_once () -> inout @yields Int : @$s3Lib3PubC6pubVarSivM  // Pub.pubVar.modify
 // CHECK-INPKG: #Pub.pkgVar!getter: (Pub) -> () -> Int : @$s3Lib3PubC6pkgVarSivg  // Pub.pkgVar.getter
 // CHECK-INPKG: #Pub.pkgVar!setter: (Pub) -> (Int) -> () : @$s3Lib3PubC6pkgVarSivs  // Pub.pkgVar.setter
-// CHECK-INPKG: #Pub.pkgVar!modify: (Pub) -> () -> () : @$s3Lib3PubC6pkgVarSivM  // Pub.pkgVar.modify
+// CHECK-INPKG: #Pub.pkgVar!modify: (Pub) -> @yield_once () -> inout @yields Int : @$s3Lib3PubC6pkgVarSivM  // Pub.pkgVar.modify
 // CHECK-INPKG: #Pub.init!allocator: (Pub.Type) -> (Int) -> Pub : @$s3Lib3PubCyACSicfC  // Pub.__allocating_init(_:)
 // CHECK-INPKG: #Pub.deinit!deallocator: @$s3Lib3PubCfD  // Pub.__deallocating_deinit
 
 // CHECK-INPKG: sil_witness_table public_external Pub: PubProto module Lib {
 // CHECK-INPKG:  method #PubProto.pubVar!getter: <Self where Self : PubProto> (Self) -> () -> Int : @$s3Lib3PubCAA0B5ProtoA2aDP6pubVarSivgTW  // protocol witness for PubProto.pubVar.getter in conformance Pub
 // CHECK-INPKG:  method #PubProto.pubVar!setter: <Self where Self : PubProto> (inout Self) -> (Int) -> () : @$s3Lib3PubCAA0B5ProtoA2aDP6pubVarSivsTW  // protocol witness for PubProto.pubVar.setter in conformance Pub
-// CHECK-INPKG:  method #PubProto.pubVar!modify: <Self where Self : PubProto> (inout Self) -> () -> () : @$s3Lib3PubCAA0B5ProtoA2aDP6pubVarSivMTW  // protocol witness for PubProto.pubVar.modify in conformance Pub
+// CHECK-INPKG:  method #PubProto.pubVar!modify: <Self where Self : PubProto> (inout Self) -> @yield_once () -> inout @yields Int : @$s3Lib3PubCAA0B5ProtoA2aDP6pubVarSivMTW  // protocol witness for PubProto.pubVar.modify in conformance Pub
 
 
 /// Test 2: They should NOT be deserialized into Client as Lib and Client are NOT in the same package;
@@ -78,17 +78,17 @@
 // CHECK-LIB: sil_vtable [serialized_for_package] Pub {
 // CHECK-LIB:    #Pub.pubVar!getter: (Pub) -> () -> Int : @$s3Lib3PubC6pubVarSivg  // Pub.pubVar.getter
 // CHECK-LIB:    #Pub.pubVar!setter: (Pub) -> (Int) -> () : @$s3Lib3PubC6pubVarSivs  // Pub.pubVar.setter
-// CHECK-LIB:    #Pub.pubVar!modify: (Pub) -> () -> () : @$s3Lib3PubC6pubVarSivM  // Pub.pubVar.modify
+// CHECK-LIB:    #Pub.pubVar!modify: (Pub) -> @yield_once () -> inout @yields Int : @$s3Lib3PubC6pubVarSivM  // Pub.pubVar.modify
 // CHECK-LIB:    #Pub.pkgVar!getter: (Pub) -> () -> Int : @$s3Lib3PubC6pkgVarSivg  // Pub.pkgVar.getter
 // CHECK-LIB:    #Pub.pkgVar!setter: (Pub) -> (Int) -> () : @$s3Lib3PubC6pkgVarSivs  // Pub.pkgVar.setter
-// CHECK-LIB:    #Pub.pkgVar!modify: (Pub) -> () -> () : @$s3Lib3PubC6pkgVarSivM  // Pub.pkgVar.modify
+// CHECK-LIB:    #Pub.pkgVar!modify: (Pub) -> @yield_once () -> inout @yields Int : @$s3Lib3PubC6pkgVarSivM  // Pub.pkgVar.modify
 // CHECK-LIB:    #Pub.init!allocator: (Pub.Type) -> (Int) -> Pub : @$s3Lib3PubCyACSicfC  // Pub.__allocating_init(_:)
 // CHECK-LIB:    #Pub.deinit!deallocator: @$s3Lib3PubCfD  // Pub.__deallocating_deinit
 
 // CHECK-LIB: sil_witness_table [serialized_for_package] Pub: PubProto module Lib {
 // CHECK-LIB:    method #PubProto.pubVar!getter: <Self where Self : PubProto> (Self) -> () -> Int : @$s3Lib3PubCAA0B5ProtoA2aDP6pubVarSivgTW  // protocol witness for PubProto.pubVar.getter in conformance Pub
 // CHECK-LIB:    method #PubProto.pubVar!setter: <Self where Self : PubProto> (inout Self) -> (Int) -> () : @$s3Lib3PubCAA0B5ProtoA2aDP6pubVarSivsTW  // protocol witness for PubProto.pubVar.setter in conformance Pub
-// CHECK-LIB:    method #PubProto.pubVar!modify: <Self where Self : PubProto> (inout Self) -> () -> () : @$s3Lib3PubCAA0B5ProtoA2aDP6pubVarSivMTW  // protocol witness for PubProto.pubVar.modify in conformance Pub
+// CHECK-LIB:    method #PubProto.pubVar!modify: <Self where Self : PubProto> (inout Self) -> @yield_once () -> inout @yields Int : @$s3Lib3PubCAA0B5ProtoA2aDP6pubVarSivMTW  // protocol witness for PubProto.pubVar.modify in conformance Pub
 
 
 //--- Lib.swift
diff --git a/test/SILOptimizer/specialize_opaque_result_types.sil b/test/SILOptimizer/specialize_opaque_result_types.sil
@@ -53,7 +53,7 @@ bb0(%0 : $*Optional<τ_0_0.Element>, %1 : $*IndexingIterator<τ_0_0>):
   copy_addr %3 to [init] %22 : $*τ_0_0.Index
   %24 = alloc_stack $τ_0_0
   copy_addr [take] %20 to [init] %24 : $*τ_0_0
-  %26 = witness_method $τ_0_0, #Collection.subscript!read : <Self where Self : Collection> (Self) -> (Self.Index) -> () : $@yield_once @convention(witness_method: Collection) <τ_0_0 where τ_0_0 : Collection> (@in_guaranteed τ_0_0.Index, @in_guaranteed τ_0_0) -> @yields @in_guaranteed τ_0_0.Element
+  %26 = witness_method $τ_0_0, #Collection.subscript!read : <Self where Self : Collection> (Self) -> @yield_once (Self.Index) -> @yields Self.Element : $@yield_once @convention(witness_method: Collection) <τ_0_0 where τ_0_0 : Collection> (@in_guaranteed τ_0_0.Index, @in_guaranteed τ_0_0) -> @yields @in_guaranteed τ_0_0.Element
 
   // The specialized begin apply %26<Test> has a result type of t_0_0.Element
   // which works out to be an opaque result type whose underlying type is Int64.
diff --git a/test/SILOptimizer/specialize_opaque_result_types_ossa.sil b/test/SILOptimizer/specialize_opaque_result_types_ossa.sil
@@ -52,7 +52,7 @@ bb0(%0 : $*Optional<τ_0_0.Element>, %1 : $*IndexingIterator<τ_0_0>):
   copy_addr %3 to [init] %22 : $*τ_0_0.Index
   %24 = alloc_stack $τ_0_0
   copy_addr [take] %20 to [init] %24 : $*τ_0_0
-  %26 = witness_method $τ_0_0, #Collection.subscript!read : <Self where Self : Collection> (Self) -> (Self.Index) -> () : $@yield_once @convention(witness_method: Collection) <τ_0_0 where τ_0_0 : Collection> (@in_guaranteed τ_0_0.Index, @in_guaranteed τ_0_0) -> @yields @in_guaranteed τ_0_0.Element
+  %26 = witness_method $τ_0_0, #Collection.subscript!read : <Self where Self : Collection> (Self) -> @yield_once (Self.Index) -> @yields Self.Element : $@yield_once @convention(witness_method: Collection) <τ_0_0 where τ_0_0 : Collection> (@in_guaranteed τ_0_0.Index, @in_guaranteed τ_0_0) -> @yields @in_guaranteed τ_0_0.Element
 
   // The specialized begin apply %26<Test> has a result type of t_0_0.Element
   // which works out to be an opaque result type whose underlying type is Int64.

Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,14 @@ func read<T>(_ c : () -> T) -> T { c() }`
`17`	`17`	`// disabled: ok!`
`18`	`18`	`var im : Int {`
`19`	`19`	`modify { // expected-enabled-error{{variable with a 'modify' accessor must also have a getter, addressor, or 'read' accessor}}`
`20`		`- 1 // expected-enabled-warning{{integer literal is unused}}`
	`20`	`+ 1 // expected-enabled-error{{unexpected non-void return value in void function}}`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`// enabled: ok`
`25`	`25`	`// disabled: ok!`
`26`	`26`	`var ir : Int {`
`27`	`27`	`read {`
`28`		`- 1 // expected-enabled-warning{{integer literal is unused}}`
	`28`	`+ 1 // expected-enabled-error{{unexpected non-void return value in void function}}`
`29`	`29`	`}`
`30`	`30`	`}`