Merge pull request #74610 from gottesmm/pr-324fd70c13e87a329334341aae4667f2d1be152c

[sending] Remove transferring.

Author: gottesmm

include/swift/ABI/MetadataValues.h

@@ -1197,7 +1197,7 @@ class TargetExtendedFunctionTypeFlags {
     // Values for the enumerated isolation kinds
     IsolatedAny            = 0x00000002U,
 
-    // Values if we have a transferring result.
+    // Values if we have a sending result.
     HasSendingResult  = 0x00000010U,
 
     /// A InvertibleProtocolSet in the high bits.

include/swift/AST/ASTBridging.h

@@ -1550,7 +1550,6 @@ enum ENUM_EXTENSIBILITY_ATTR(open) BridgedAttributedTypeSpecifier : size_t {
   BridgedAttributedTypeSpecifierLegacyOwned,
   BridgedAttributedTypeSpecifierConst,
   BridgedAttributedTypeSpecifierIsolated,
-  BridgedAttributedTypeSpecifierTransferring,
   BridgedAttributedTypeSpecifierSending,
 };
 

include/swift/AST/DiagnosticsParse.def

@@ -2204,19 +2204,10 @@ ERROR(lifetime_dependence_invalid_init_return, PointsToFirstBadToken,
       "specifiers",
       ())
 
-ERROR(transferring_after_parameter_specifier,none,
-      "'transferring' must be placed before specifier '%0'", (StringRef))
-ERROR(transferring_repeated,none,
-      "parameter may have at most one 'transferring' specifier", ())
 ERROR(sending_before_parameter_specifier,none,
       "'sending' must be placed after specifier '%0'", (StringRef))
 ERROR(sending_repeated,none,
       "parameter may have at most one 'sending' specifier", ())
-ERROR(sending_and_transferring_used_together,none,
-      "'transferring' and 'sending' may not be used together", ())
-WARNING(transferring_is_now_sendable,none,
-        "'transferring' has been renamed to 'sending' and the 'transferring' spelling will be removed shortly",
-        ())
 ERROR(sending_cannot_be_used_with_borrowing,none,
       "'%0' cannot be used together with 'borrowing'", (StringRef))
 

include/swift/AST/DiagnosticsSema.def

@@ -7979,16 +7979,9 @@ ERROR(lifetime_dependence_immortal_conflict_name, none,
       "conflict between the parameter name and immortal keyword", ())
 
 //===----------------------------------------------------------------------===//
-//                             MARK: Transferring
+//                             MARK: Sending
 //===----------------------------------------------------------------------===//
 
-ERROR(transferring_unsupported_param_specifier, none,
-      "'%0' cannot be applied to a 'transferring' parameter", (StringRef))
-
-ERROR(transferring_only_on_parameters_and_results, none,
-      "'transferring' may only be used on parameters and results", ())
-ERROR(transferring_cannot_be_applied_to_tuple_elt, none,
-      "'transferring' cannot be applied to tuple elements", ())
 ERROR(sending_unsupported_param_specifier, none,
       "'%0' cannot be applied to a 'sending' parameter", (StringRef))
 ERROR(sending_only_on_parameters_and_results, none,

include/swift/AST/ExtInfo.h

@@ -486,15 +486,15 @@ class ASTExtInfoBuilder {
                           DifferentiabilityKind::NonDifferentiable, nullptr,
                           FunctionTypeIsolation::forNonIsolated(),
                           LifetimeDependenceInfo(),
-                          false /*transferringResult*/) {}
+                          false /*sendingResult*/) {}
 
   // Constructor for polymorphic type.
   ASTExtInfoBuilder(Representation rep, bool throws, Type thrownError)
       : ASTExtInfoBuilder(rep, false, throws, thrownError,
                           DifferentiabilityKind::NonDifferentiable, nullptr,
                           FunctionTypeIsolation::forNonIsolated(),
                           LifetimeDependenceInfo(),
-                          false /*transferringResult*/) {}
+                          false /*sendingResult*/) {}
 
   // Constructor with no defaults.
   ASTExtInfoBuilder(Representation rep, bool isNoEscape, bool throws,

include/swift/AST/TypeRepr.h

@@ -1119,7 +1119,6 @@ class SpecifierTypeRepr : public TypeRepr {
            T->getKind() == TypeReprKind::Isolated ||
            T->getKind() == TypeReprKind::CompileTimeConst ||
            T->getKind() == TypeReprKind::LifetimeDependentReturn ||
-           T->getKind() == TypeReprKind::Transferring ||
            T->getKind() == TypeReprKind::Sending;
   }
   static bool classof(const SpecifierTypeRepr *T) { return true; }
@@ -1191,21 +1190,6 @@ class CompileTimeConstTypeRepr : public SpecifierTypeRepr {
   static bool classof(const CompileTimeConstTypeRepr *T) { return true; }
 };
 
-/// A transferring type.
-/// \code
-///   x : transferring Int
-/// \endcode
-class TransferringTypeRepr : public SpecifierTypeRepr {
-public:
-  TransferringTypeRepr(TypeRepr *Base, SourceLoc InOutLoc)
-      : SpecifierTypeRepr(TypeReprKind::Transferring, Base, InOutLoc) {}
-
-  static bool classof(const TypeRepr *T) {
-    return T->getKind() == TypeReprKind::Transferring;
-  }
-  static bool classof(const TransferringTypeRepr *T) { return true; }
-};
-
 /// A sending type.
 /// \code
 ///   x : sending Int
@@ -1621,7 +1605,6 @@ inline bool TypeRepr::isSimple() const {
   case TypeReprKind::Array:
   case TypeReprKind::SILBox:
   case TypeReprKind::Isolated:
-  case TypeReprKind::Transferring:
   case TypeReprKind::Sending:
   case TypeReprKind::Placeholder:
   case TypeReprKind::CompileTimeConst:

include/swift/AST/TypeReprNodes.def

@@ -70,7 +70,6 @@ ABSTRACT_TYPEREPR(Specifier, TypeRepr)
   SPECIFIER_TYPEREPR(Ownership, SpecifierTypeRepr)
   SPECIFIER_TYPEREPR(Isolated, SpecifierTypeRepr)
   SPECIFIER_TYPEREPR(CompileTimeConst, SpecifierTypeRepr)
-  SPECIFIER_TYPEREPR(Transferring, SpecifierTypeRepr)
   SPECIFIER_TYPEREPR(Sending, SpecifierTypeRepr)
 TYPEREPR(Fixed, TypeRepr)
 TYPEREPR(SILBox, TypeRepr)

include/swift/AST/Types.h

@@ -2429,7 +2429,7 @@ class YieldTypeFlags {
                               /*nonEphemeral*/ false, getOwnershipSpecifier(),
                               /*isolated*/ false, /*noDerivative*/ false,
                               /*compileTimeConst*/ false,
-                              /*is transferring*/ false);
+                              /*is sending*/ false);
   }
 
   bool operator ==(const YieldTypeFlags &other) const {

include/swift/Basic/Features.def

@@ -196,7 +196,6 @@ SUPPRESSIBLE_LANGUAGE_FEATURE(NoncopyableGenerics, 427, "Noncopyable generics")
 SUPPRESSIBLE_LANGUAGE_FEATURE(ConformanceSuppression, 426, "Suppressible inferred conformances")
 SUPPRESSIBLE_LANGUAGE_FEATURE(BitwiseCopyable2, 426, "BitwiseCopyable feature")
 LANGUAGE_FEATURE(BodyMacros, 415, "Function body macros")
-LANGUAGE_FEATURE(TransferringArgsAndResults, 430, "Transferring args and results")
 SUPPRESSIBLE_LANGUAGE_FEATURE(SendingArgsAndResults, 430, "Sending arg and results")
 LANGUAGE_FEATURE(BorrowingSwitch, 432, "Noncopyable type pattern matching")
 CONDITIONALLY_SUPPRESSIBLE_LANGUAGE_FEATURE(IsolatedAny, 431, "@isolated(any) function types")

include/swift/Option/FrontendOptions.td

@@ -1377,11 +1377,6 @@ def disable_experimental_parser_round_trip : Flag<["-"],
   "disable-experimental-parser-round-trip">,
   HelpText<"Disable round trip through the new swift parser">;
 
-def disable_transferring_args_and_results_with_region_isolation : Flag<["-"],
-  "disable-transferring-args-and-results-with-region-based-isolation">,
-  HelpText<"Disable transferring args and results when region based isolation is enabled. Only enabled with asserts">,
-  Flags<[HelpHidden]>;
-
 def disable_sending_args_and_results_with_region_isolation : Flag<["-"],
   "disable-sending-args-and-results-with-region-based-isolation">,
   HelpText<"Disable sending args and results when region based isolation is enabled. Only enabled with asserts">,