Merge pull request #77603 from nate-chandler/general-coro/20241113/1

[CoroutineAccessors] Several small fixes.

Author: nate-chandler

lib/SIL/IR/SILSymbolVisitor.cpp

@@ -823,6 +823,11 @@ class SILSymbolVisitorImpl : public ASTVisitor<SILSymbolVisitorImpl> {
             Visitor.addDispatchThunk(declRef);
             Visitor.addMethodDescriptor(declRef);
           }
+          auto *decl =
+              llvm::dyn_cast_or_null<AbstractFunctionDecl>(declRef.getDecl());
+          if (decl && decl->hasBody()) {
+            Visitor.addFunction(declRef);
+          }
         }
 
         void addAssociatedType(AssociatedType associatedType) {

lib/SIL/Parser/ParseSIL.cpp

@@ -1291,7 +1291,9 @@ static std::optional<AccessorKind> getAccessorKind(StringRef ident) {
       .Case("addressor", AccessorKind::Address)
       .Case("mutableAddressor", AccessorKind::MutableAddress)
       .Case("read", AccessorKind::Read)
+      .Case("read2", AccessorKind::Read2)
       .Case("modify", AccessorKind::Modify)
+      .Case("modify2", AccessorKind::Modify2)
       .Default(std::nullopt);
 }
 

lib/SILOptimizer/Utils/Devirtualize.cpp

@@ -619,6 +619,10 @@ replaceBeginApplyInst(SILBuilder &builder, SILPassManager *pm, SILLocation loc,
   // Forward the token.
   oldBAI->getTokenResult()->replaceAllUsesWith(newBAI->getTokenResult());
 
+  if (auto *allocation = oldBAI->getCalleeAllocationResult()) {
+    allocation->replaceAllUsesWith(newBAI->getCalleeAllocationResult());
+  }
+
   auto oldYields = oldBAI->getYieldedValues();
   auto newYields = newBAI->getYieldedValues();
   assert(oldYields.size() == newYields.size());

lib/Sema/TypeCheckProtocol.cpp

@@ -6850,6 +6850,7 @@ void TypeChecker::inferDefaultWitnesses(ProtocolDecl *proto) {
         RequirementEnvironment reqEnv(proto, reqSig, proto, nullptr, nullptr);
         auto match =
             RequirementMatch(asd, MatchKind::ExactMatch, asdTy, reqEnv);
+        match.WitnessSubstitutions = reqEnv.getRequirementToWitnessThunkSubs();
         checker.recordWitness(asd, match);
       }
     }

lib/Sema/TypeCheckStorage.cpp

@@ -950,6 +950,9 @@ bool AccessorDecl::doesAccessorHaveBody() const {
     if (!requiresFeatureCoroutineAccessors(accessor->getAccessorKind())) {
       return false;
     }
+    if (storage->getOverrideLoc()) {
+      return false;
+    }
     return accessor->getStorage()
         ->requiresCorrespondingUnderscoredCoroutineAccessor(
             accessor->getAccessorKind(), accessor);

test/SILGen/coroutine_accessors.swift

@@ -235,3 +235,13 @@ class OverridableReader : GettableTitle {
     }
   }
 }
+
+// CHECK-LABEL: sil_default_witness_table ReadableField {
+// CHECK-NEXT:    no_default
+// CHECK-NEXT:    method #ReadableField.field!read2 
+// CHECK-SAME:        : @$s19coroutine_accessors13ReadableFieldP5fieldSivy
+// CHECK-NEXT:  }
+public protocol ReadableField {
+  @_borrowed
+  var field: Int { get }
+}

test/SILOptimizer/devirtualize_coroutine_accessors.sil

@@ -0,0 +1,50 @@
+// RUN: %target-sil-opt \
+// RUN:     -devirtualizer \
+// RUN:     %s \
+// RUN:     -enable-sil-verify-all \
+// RUN:     -enable-experimental-feature CoroutineAccessors \
+// RUN: | %FileCheck %s
+
+// REQUIRES: swift_feature_CoroutineAccessors
+
+import Builtin
+
+struct Int {
+  var _value: Builtin.Word
+}
+
+class Base {
+  var x : Int { read }
+}
+
+class Derived : Base {
+  override var x : Int { read }
+}
+
+// CHECK-LABEL: sil [ossa] @utilize_begin_apply : {{.*}} {
+// CHECK-NOT:     class_method
+// CHECK-LABEL: } // end sil function 'utilize_begin_apply'
+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
+  (%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
+  destroy_value %base : $Base
+  %retval = tuple ()
+  return %retval : $()
+}
+
+sil [ossa] @Base_x_read2 : $@yield_once_2 @convention(method) (@guaranteed Base) -> @yields Int
+
+sil [ossa] @Derived_x_read2 : $@yield_once_2 @convention(method) (@guaranteed Base) -> @yields Int
+
+sil_vtable Base {
+  #Base.x!read2: @Base_x_read2
+}
+
+sil_vtable Derived {
+  #Base.x!read2: @Derived_x_read2 [override]
+}

test/TBD/coroutine_accessors.swift

@@ -0,0 +1,23 @@
+// RUN: %target-build-swift-dylib(%t/%target-library-name(thing)) \
+// RUN:     %s                                                    \
+// RUN:     -emit-tbd                                             \
+// RUN:     -Xfrontend -validate-tbd-against-ir=all               \
+// RUN:     -enable-library-evolution                             \
+// RUN:     -Xfrontend -tbd-install_name -Xfrontend thing         \
+// RUN:     -emit-module                                          \
+// RUN:     -module-name thing                                    \
+// RUN:     -enable-experimental-feature CoroutineAccessors
+
+// REQUIRES: swift_feature_CoroutineAccessors
+
+public struct S {}
+
+public protocol P {
+  associatedtype A
+
+  var s: S { read set }
+}
+
+public protocol Q : P {
+  override var s: S { read set }
+}