Merge pull request #36176 from slavapestov/reasync-call-site-checking

Implementing checking for 'reasync' call sites

Author: slavapestov

include/swift/AST/DiagnosticsSema.def

@@ -3024,6 +3024,8 @@ ERROR(rethrows_without_throwing_parameter,none,
 ERROR(override_reasync_with_non_reasync,none,
       "override of 'reasync' %select{method|initializer}0 should also "
       "be 'reasync'", (bool))
+ERROR(reasync_without_async_parameter,none,
+      "'reasync' function must take an 'async' function argument", ())
 
 ERROR(autoclosure_function_type,none,
       "@autoclosure attribute only applies to function types",

lib/Parse/ParsePattern.cpp

@@ -851,7 +851,8 @@ ParserStatus Parser::parseEffectsSpecifiers(SourceLoc existingArrowLoc,
 
   while (true) {
     // 'async'
-    bool isReasync = Tok.isContextualKeyword("reasync");
+    bool isReasync = (shouldParseExperimentalConcurrency() &&
+                      Tok.isContextualKeyword("reasync"));
     if (Tok.isContextualKeyword("async") ||
         isReasync) {
       if (asyncLoc.isValid()) {

lib/Sema/TypeCheckAttr.cpp

@@ -131,6 +131,8 @@ class AttributeChecker : public AttributeVisitor<AttributeChecker> {
   IGNORED_ATTR(NoDerivative)
   IGNORED_ATTR(SpecializeExtension)
   IGNORED_ATTR(Concurrent)
+  IGNORED_ATTR(AtRethrows)
+  IGNORED_ATTR(AtReasync)
 #undef IGNORED_ATTR
 
   void visitAlignmentAttr(AlignmentAttr *attr) {
@@ -225,7 +227,6 @@ class AttributeChecker : public AttributeVisitor<AttributeChecker> {
   void visitNSCopyingAttr(NSCopyingAttr *attr);
   void visitRequiredAttr(RequiredAttr *attr);
   void visitRethrowsAttr(RethrowsAttr *attr);
-  void visitAtRethrowsAttr(AtRethrowsAttr *attr);
 
   void checkApplicationMainAttribute(DeclAttribute *attr,
                                      Identifier Id_ApplicationDelegate,
@@ -280,7 +281,6 @@ class AttributeChecker : public AttributeVisitor<AttributeChecker> {
   void visitMarkerAttr(MarkerAttr *attr);
 
   void visitReasyncAttr(ReasyncAttr *attr);
-  void visitAtReasyncAttr(AtReasyncAttr *attr);
 };
 } // end anonymous namespace
 
@@ -2064,8 +2064,8 @@ void AttributeChecker::visitRequiredAttr(RequiredAttr *attr) {
 }
 
 void AttributeChecker::visitRethrowsAttr(RethrowsAttr *attr) {
-  // 'rethrows' only applies to functions that take throwing functions
-  // as parameters.
+  // Make sure the function takes a 'throws' function argument or a
+  // conformance to a '@rethrows' protocol.
   auto fn = dyn_cast<AbstractFunctionDecl>(D);
   if (fn->getPolymorphicEffectKind(EffectKind::Throws)
         != PolymorphicEffectKind::Invalid) {
@@ -2076,8 +2076,6 @@ void AttributeChecker::visitRethrowsAttr(RethrowsAttr *attr) {
   attr->setInvalid();
 }
 
-void AttributeChecker::visitAtRethrowsAttr(AtRethrowsAttr *attr) {}
-
 /// Collect all used generic parameter types from a given type.
 static void collectUsedGenericParameters(
     Type Ty, SmallPtrSetImpl<TypeBase *> &ConstrainedGenericParams) {
@@ -5566,10 +5564,17 @@ void AttributeChecker::visitMarkerAttr(MarkerAttr *attr) {
 }
 
 void AttributeChecker::visitReasyncAttr(ReasyncAttr *attr) {
-  // FIXME
-}
+  // Make sure the function takes a 'throws' function argument or a
+  // conformance to a '@rethrows' protocol.
+  auto fn = dyn_cast<AbstractFunctionDecl>(D);
+  if (fn->getPolymorphicEffectKind(EffectKind::Async)
+        != PolymorphicEffectKind::Invalid) {
+    return;
+  }
 
-void AttributeChecker::visitAtReasyncAttr(AtReasyncAttr *attr) {}
+  diagnose(attr->getLocation(), diag::reasync_without_async_parameter);
+  attr->setInvalid();
+}
 
 namespace {