AST: Re-baseline SendingArgsAndResults feature.

Author: tshortli

include/swift/AST/PrintOptions.h

@@ -436,9 +436,6 @@ struct PrintOptions {
   /// Suppress 'isolated' and '#isolation' on isolated parameters with optional type.
   bool SuppressOptionalIsolatedParams = false;
 
-  /// Suppress 'sending' on arguments and results.
-  bool SuppressSendingArgsAndResults = false;
-
   /// Suppress printing of '~Proto' for suppressible, non-invertible protocols.
   bool SuppressConformanceSuppression = false;
 

include/swift/Basic/Features.def

@@ -248,7 +248,7 @@ BASELINE_LANGUAGE_FEATURE(NoncopyableGenerics2, 427, "Noncopyable generics alias
 BASELINE_LANGUAGE_FEATURE(ConformanceSuppression, 426, "Suppressible inferred conformances")
 BASELINE_LANGUAGE_FEATURE(BitwiseCopyable2, 426, "BitwiseCopyable feature")
 BASELINE_LANGUAGE_FEATURE(BodyMacros, 415, "Function body macros")
-SUPPRESSIBLE_LANGUAGE_FEATURE(SendingArgsAndResults, 430, "Sending arg and results")
+LANGUAGE_FEATURE(SendingArgsAndResults, 430, "Sending arg and results")
 BASELINE_LANGUAGE_FEATURE(BorrowingSwitch, 432, "Noncopyable type pattern matching")
 BASELINE_LANGUAGE_FEATURE(IsolatedAny, 431, "@isolated(any) function types")
 LANGUAGE_FEATURE(IsolatedAny2, 431, "@isolated(any) function types")

include/swift/Parse/Parser.h

@@ -1172,8 +1172,7 @@ class Parser {
       return true;
     if (isCallerIsolatedSpecifier())
       return true;
-    if (Context.LangOpts.hasFeature(Feature::SendingArgsAndResults) &&
-        Tok.isContextualKeyword("sending"))
+    if (Tok.isContextualKeyword("sending"))
       return true;
     return false;
   }

lib/AST/ASTPrinter.cpp

@@ -3220,13 +3220,6 @@ void PrintAST::printExtension(ExtensionDecl *decl) {
   }
 }
 
-static void
-suppressingFeatureSendingArgsAndResults(PrintOptions &options,
-                                        llvm::function_ref<void()> action) {
-  llvm::SaveAndRestore<bool> scope(options.SuppressSendingArgsAndResults, true);
-  action();
-}
-
 static void
 suppressingFeatureLifetimes(PrintOptions &options,
                                      llvm::function_ref<void()> action) {
@@ -3854,17 +3847,7 @@ static void printParameterFlags(ASTPrinter &printer,
   }
 
   if (flags.isSending()) {
-    if (!options.SuppressSendingArgsAndResults) {
-      printer.printKeyword("sending", options, " ");
-    } else if (flags.getOwnershipSpecifier() ==
-               ParamSpecifier::ImplicitlyCopyableConsuming) {
-      // Ok. We are suppressing sending. If our ownership specifier was
-      // originally implicitly copyable consuming our argument was being passed
-      // at +1. By not printing sending, we would be changing the API
-      // potentially to take the parameter at +0 instead of +1. To work around
-      // this, print out consuming so that we preserve the +1 parameter.
-      printer.printKeyword("__owned", options, " ");
-    }
+    printer.printKeyword("sending", options, " ");
   }
 
   if (flags.isIsolated()) {
@@ -4327,14 +4310,12 @@ void PrintAST::visitFuncDecl(FuncDecl *decl) {
       Printer.printDeclResultTypePre(decl, ResultTyLoc);
       Printer.callPrintStructurePre(PrintStructureKind::FunctionReturnType);
 
-      if (!Options.SuppressSendingArgsAndResults) {
-        if (decl->hasSendingResult()) {
+      if (decl->hasSendingResult()) {
+        Printer << "sending ";
+      } else if (auto *ft = llvm::dyn_cast_if_present<AnyFunctionType>(
+                     decl->getInterfaceType())) {
+        if (ft->hasExtInfo() && ft->hasSendingResult()) {
           Printer << "sending ";
-        } else if (auto *ft = llvm::dyn_cast_if_present<AnyFunctionType>(
-                       decl->getInterfaceType())) {
-          if (ft->hasExtInfo() && ft->hasSendingResult()) {
-            Printer << "sending ";
-          }
         }
       }
 
@@ -4507,12 +4488,10 @@ void PrintAST::visitSubscriptDecl(SubscriptDecl *decl) {
     Printer.printDeclResultTypePre(decl, elementTy);
     Printer.callPrintStructurePre(PrintStructureKind::FunctionReturnType);
 
-    if (!Options.SuppressSendingArgsAndResults) {
       if (decl->getElementTypeRepr()) {
         if (isa<SendingTypeRepr>(decl->getResultTypeRepr()))
           Printer << "sending ";
       }
-    }
 
     PrintWithOpaqueResultTypeKeywordRAII x(Options);
     auto nrOptions = getNonRecursiveOptions(decl);
@@ -6798,8 +6777,7 @@ class TypePrinter : public TypeVisitor<TypePrinter, void, NonRecursivePrintOptio
 
     Printer << " -> ";
 
-    if (!Options.SuppressSendingArgsAndResults && T->hasExtInfo() &&
-        T->hasSendingResult()) {
+    if (T->hasExtInfo() && T->hasSendingResult()) {
       Printer.printKeyword("sending ", Options);
     }
 

lib/AST/FeatureSet.cpp

@@ -140,56 +140,7 @@ UNINTERESTING_FEATURE(StaticExclusiveOnly)
 UNINTERESTING_FEATURE(ExtractConstantsFromMembers)
 UNINTERESTING_FEATURE(GroupActorErrors)
 UNINTERESTING_FEATURE(SameElementRequirements)
-
-static bool usesFeatureSendingArgsAndResults(Decl *decl) {
-  auto isFunctionTypeWithSending = [](Type type) {
-      auto fnType = type->getAs<AnyFunctionType>();
-      if (!fnType)
-        return false;
-
-      if (fnType->hasExtInfo() && fnType->hasSendingResult())
-        return true;
-
-      return llvm::any_of(fnType->getParams(),
-                          [](AnyFunctionType::Param param) {
-                            return param.getParameterFlags().isSending();
-                          });
-  };
-  auto declUsesFunctionTypesThatUseSending = [&](Decl *decl) {
-    return usesTypeMatching(decl, isFunctionTypeWithSending);
-  };
-
-  if (auto *pd = dyn_cast<ParamDecl>(decl)) {
-    if (pd->isSending()) {
-      return true;
-    }
-
-    if (declUsesFunctionTypesThatUseSending(pd))
-      return true;
-  }
-
-  if (auto *fDecl = dyn_cast<AbstractFunctionDecl>(decl)) {
-    // First check for param decl results.
-    if (llvm::any_of(fDecl->getParameters()->getArray(), [](ParamDecl *pd) {
-          return usesFeatureSendingArgsAndResults(pd);
-        }))
-      return true;
-    if (declUsesFunctionTypesThatUseSending(decl))
-      return true;
-  }
-
-  // Check if we have a pattern binding decl for a function that has sending
-  // parameters and results.
-  if (auto *pbd = dyn_cast<PatternBindingDecl>(decl)) {
-    for (auto index : range(pbd->getNumPatternEntries())) {
-      auto *pattern = pbd->getPattern(index);
-      if (pattern->hasType() && isFunctionTypeWithSending(pattern->getType()))
-        return true;
-    }
-  }
-
-  return false;
-}
+UNINTERESTING_FEATURE(SendingArgsAndResults)
 
 static bool findUnderscoredLifetimeAttr(Decl *decl) {
   auto hasUnderscoredLifetimeAttr = [](Decl *decl) {

lib/AST/TypeRepr.cpp

@@ -472,20 +472,7 @@ void FunctionTypeRepr::printImpl(ASTPrinter &Printer,
   Printer << " -> ";
   Printer.callPrintStructurePre(PrintStructureKind::FunctionReturnType);
 
-  // Check if we are supposed to suppress sending results. If so, look through
-  // the ret ty if it is a Sending TypeRepr.
-  //
-  // DISCUSSION: The reason why we do this is that Sending TypeRepr is used for
-  // arguments and results... and we need the arguments case when we suppress to
-  // print __owned. So this lets us handle both cases.
-  auto ActualRetTy = RetTy;
-  if (Opts.SuppressSendingArgsAndResults) {
-    if (auto *x = dyn_cast<SendingTypeRepr>(RetTy)) {
-      ActualRetTy = x->getBase();
-    }
-  }
-  printTypeRepr(ActualRetTy, Printer, Opts);
-
+  printTypeRepr(RetTy, Printer, Opts);
   Printer.printStructurePost(PrintStructureKind::FunctionReturnType);
   Printer.printStructurePost(PrintStructureKind::FunctionType);
 }
@@ -926,13 +913,7 @@ void SpecifierTypeRepr::printImpl(ASTPrinter &Printer,
     Printer.printKeyword("isolated", Opts, " ");
     break;
   case TypeReprKind::Sending:
-    // This handles the argument case. The result case is handled in
-    // FunctionTypeRepr.
-    if (!Opts.SuppressSendingArgsAndResults) {
-      Printer.printKeyword("sending", Opts, " ");
-    } else {
-      Printer.printKeyword("__owned", Opts, " ");
-    }
+    Printer.printKeyword("sending", Opts, " ");
     break;
   case TypeReprKind::CompileTimeLiteral:
     Printer.printKeyword("_const", Opts, " ");