Merge pull request #79560 from stzn/fix-subscript-sending-result

Add sending to subscript sending result

Author: xedin

lib/AST/ASTPrinter.cpp

@@ -4517,6 +4517,13 @@ void PrintAST::visitSubscriptDecl(SubscriptDecl *decl) {
     Printer.printDeclResultTypePre(decl, elementTy);
     Printer.callPrintStructurePre(PrintStructureKind::FunctionReturnType);
 
+    if (!Options.SuppressSendingArgsAndResults) {
+      if (auto typeRepr = decl->getElementTypeRepr()) {
+        if (isa<SendingTypeRepr>(decl->getResultTypeRepr()))
+          Printer << "sending ";
+      }
+    }
+
     PrintWithOpaqueResultTypeKeywordRAII x(Options);
     printTypeLocForImplicitlyUnwrappedOptional(
       elementTy, decl->isImplicitlyUnwrappedOptional());

lib/AST/Decl.cpp

@@ -11017,6 +11017,9 @@ AccessorDecl *AccessorDecl::createParsed(
 
       newParams.push_back(param);
     }
+
+    if (isa<SendingTypeRepr>(SD->getElementTypeRepr()))
+      accessor->setSendingResult();
   }
   accessor->setParameters(
       ParameterList::create(ctx, paramsStart, newParams, paramsEnd));

lib/Sema/TypeCheckDecl.cpp

@@ -2656,6 +2656,10 @@ InterfaceTypeRequest::evaluate(Evaluator &eval, ValueDecl *D) const {
     AnyFunctionType::ExtInfoBuilder infoBuilder;
     maybeAddParameterIsolation(infoBuilder, argTy);
 
+    if (auto typeRepr = SD->getElementTypeRepr())
+      if (isa<SendingTypeRepr>(typeRepr))
+        infoBuilder = infoBuilder.withSendingResult();
+
     Type funcTy;
     // FIXME: Verify ExtInfo state is correct, not working by accident.
     auto info = infoBuilder.build();

test/Concurrency/sending_subscript.swift

@@ -0,0 +1,22 @@
+// RUN: %target-swift-frontend -swift-version 6 %s -emit-silgen | %FileCheck %s
+
+// REQUIRES: concurrency
+
+class NonSendableKlass {}
+
+// CHECK-DAG: subscript(_: sending NonSendableKlass) -> sending NonSendableKlass { get }
+
+// CHECK-DAG: sil hidden [ossa] @$s17sending_subscript1SVyAA16NonSendableKlassCAEncig : $@convention(method) (@sil_sending @owned NonSendableKlass, S) -> @sil_sending @owned NonSendableKlass {
+struct S {
+  subscript(_: sending NonSendableKlass) -> sending NonSendableKlass { NonSendableKlass() }
+}
+
+// CHECK-DAG: subscript(_: sending NonSendableKlass) -> sending (NonSendableKlass, NonSendableKlass) { get }
+
+// CHECK-DAG: sil hidden [ossa] @$s17sending_subscript2S2VyAA16NonSendableKlassC_AEtAEncig : $@convention(method) (@sil_sending @owned NonSendableKlass, S2) -> (@sil_sending @owned NonSendableKlass, @sil_sending @owned NonSendableKlass) {
+struct S2 {
+  subscript(_: sending NonSendableKlass) -> sending (NonSendableKlass, NonSendableKlass) { 
+    (NonSendableKlass(), NonSendableKlass()) 
+  }
+}
+