Merge pull request #2057 from swiftwasm/main

[pull] swiftwasm from main

Author: pull[bot]

cmake/modules/StandaloneOverlay.cmake

@@ -58,9 +58,17 @@ set(SWIFT_NATIVE_CLANG_TOOLS_PATH "${TOOLCHAIN_DIR}/usr/bin" CACHE STRING
 set(SWIFT_NATIVE_SWIFT_TOOLS_PATH "${TOOLCHAIN_DIR}/usr/bin" CACHE STRING
   "Path to Swift tools that are executable on the build machine.")
 
+# NOTE: The initialization in stdlib/CMakeLists.txt will be bypassed if we
+# directly invoke CMake for this directory, so we initialize the variables
+# related to library evolution here as well.
+
+option(SWIFT_STDLIB_STABLE_ABI
+  "Should stdlib be built with stable ABI (library evolution, resilience)."
+  TRUE)
+
 option(SWIFT_ENABLE_MODULE_INTERFACES
   "Generate .swiftinterface files alongside .swiftmodule files."
-  TRUE)
+  "${SWIFT_STDLIB_STABLE_ABI}")
 
 set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
   "Build type for the Swift standard library and SDK overlays.")

docs/LibraryEvolution.rst

@@ -159,7 +159,7 @@ No other changes are permitted; the following are particularly of note:
   not they have default arguments.
 - An ABI-public function that throws may not become non-throwing or vice versa.
 - The ``@escaping`` attribute may not be added to or removed from a parameter.
-- Adding or removing a function builder from a parameter is a
+- Adding or removing a result builder from a parameter is a
   `binary-compatible source-breaking change`.
 
 

include/swift/AST/ASTTypeIDZone.def

@@ -20,7 +20,7 @@ SWIFT_TYPEID(AncestryFlags)
 SWIFT_TYPEID(BodyInitKind)
 SWIFT_TYPEID(BodyInitKindAndExpr)
 SWIFT_TYPEID(CtorInitializerKind)
-SWIFT_TYPEID(FunctionBuilderBodyPreCheck)
+SWIFT_TYPEID(ResultBuilderBodyPreCheck)
 SWIFT_TYPEID(GenericSignature)
 SWIFT_TYPEID(ImplicitImportList)
 SWIFT_TYPEID(ImplicitMemberAction)

include/swift/AST/ASTTypeIDs.h

@@ -35,7 +35,7 @@ class CustomAttr;
 class Decl;
 class EnumDecl;
 class FuncDecl;
-enum class FunctionBuilderBodyPreCheck : uint8_t;
+enum class ResultBuilderBodyPreCheck : uint8_t;
 class GenericParamList;
 class GenericSignature;
 class GenericTypeParamType;

include/swift/AST/Attr.def

@@ -493,8 +493,8 @@ SIMPLE_DECL_ATTR(_disfavoredOverload, DisfavoredOverload,
   OnAbstractFunction | OnVar | OnSubscript | UserInaccessible |
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
   87)
-SIMPLE_DECL_ATTR(_functionBuilder, FunctionBuilder,
-  OnNominalType | UserInaccessible |
+SIMPLE_DECL_ATTR(resultBuilder, ResultBuilder,
+  OnNominalType |
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
   88)
 DECL_ATTR(_projectedValueProperty, ProjectedValueProperty,

include/swift/AST/Decl.h

@@ -2402,12 +2402,12 @@ class ValueDecl : public Decl {
   OpaqueReturnTypeRepr *getOpaqueResultTypeRepr() const;
 
   /// Retrieve the attribute associating this declaration with a
-  /// function builder, if there is one.
-  CustomAttr *getAttachedFunctionBuilder() const;
+  /// result builder, if there is one.
+  CustomAttr *getAttachedResultBuilder() const;
 
-  /// Retrieve the @functionBuilder type attached to this declaration,
+  /// Retrieve the @resultBuilder type attached to this declaration,
   /// if there is one.
-  Type getFunctionBuilderType() const;
+  Type getResultBuilderType() const;
 
   /// If this value or its backing storage is annotated
   /// @_dynamicReplacement(for: ...), compute the original declaration

include/swift/AST/DiagnosticsSema.def

@@ -5352,83 +5352,83 @@ ERROR(property_wrapper_missing_arg_init, none, "missing argument for parameter "
       "arguments in '@%1(...)'", (Identifier, StringRef))
 
 //------------------------------------------------------------------------------
-// MARK: function builder diagnostics
+// MARK: result builder diagnostics
 //------------------------------------------------------------------------------
-ERROR(function_builder_decl, none,
-      "closure containing a declaration cannot be used with function "
+ERROR(result_builder_decl, none,
+      "closure containing a declaration cannot be used with result "
       "builder %0", (DeclName))
-NOTE(note_function_builder_decl, none,
-      "closure containing a declaration cannot be used with function "
+NOTE(note_result_builder_decl, none,
+      "closure containing a declaration cannot be used with result "
       "builder %0", (DeclName))
-ERROR(function_builder_control_flow, none,
-      "closure containing control flow statement cannot be used with function "
+ERROR(result_builder_control_flow, none,
+      "closure containing control flow statement cannot be used with result "
       "builder %0", (DeclName))
-NOTE(note_function_builder_control_flow, none,
-      "closure containing control flow statement cannot be used with function "
+NOTE(note_result_builder_control_flow, none,
+      "closure containing control flow statement cannot be used with result "
       "builder %0", (DeclName))
-ERROR(function_builder_attribute_not_allowed_here, none,
-      "function builder attribute %0 can only be applied to a parameter, "
+ERROR(result_builder_attribute_not_allowed_here, none,
+      "result builder attribute %0 can only be applied to a parameter, "
       "function, or computed property", (Identifier))
-ERROR(function_builder_attribute_on_storage_without_getter, none,
-      "function builder attribute %0 can only be applied to a "
+ERROR(result_builder_attribute_on_storage_without_getter, none,
+      "result builder attribute %0 can only be applied to a "
       "%select{subscript|property|constant|variable}1 if it defines a getter",
       (DeclName, unsigned))
-ERROR(function_builder_parameter_not_of_function_type, none,
-      "function builder attribute %0 can only be applied to a parameter of "
+ERROR(result_builder_parameter_not_of_function_type, none,
+      "result builder attribute %0 can only be applied to a parameter of "
       "function type",
       (Identifier))
-ERROR(function_builder_parameter_autoclosure, none,
-      "function builder attribute %0 cannot be applied to an autoclosure "
+ERROR(result_builder_parameter_autoclosure, none,
+      "result builder attribute %0 cannot be applied to an autoclosure "
       "parameter",
       (Identifier))
-ERROR(function_builder_multiple, none,
-      "only one function builder attribute can be attached to a "
+ERROR(result_builder_multiple, none,
+      "only one result builder attribute can be attached to a "
       "%select{declaration|parameter}0", (bool))
-NOTE(previous_function_builder_here, none,
-     "previous function builder specified here", ())
-ERROR(function_builder_arguments, none,
-      "function builder attributes cannot have arguments", ())
-WARNING(function_builder_disabled_by_return, none,
-        "application of function builder %0 disabled by explicit 'return' "
+NOTE(previous_result_builder_here, none,
+     "previous result builder specified here", ())
+ERROR(result_builder_arguments, none,
+      "result builder attributes cannot have arguments", ())
+WARNING(result_builder_disabled_by_return, none,
+        "application of result builder %0 disabled by explicit 'return' "
         "statement", (Type))
-NOTE(function_builder_remove_attr, none,
-     "remove the attribute to explicitly disable the function builder", ())
-NOTE(function_builder_remove_returns, none,
-     "remove 'return' statements to apply the function builder", ())
-ERROR(function_builder_infer_ambig, none,
-      "ambiguous function builder inferred for %0: %1 or %2",
+NOTE(result_builder_remove_attr, none,
+     "remove the attribute to explicitly disable the result builder", ())
+NOTE(result_builder_remove_returns, none,
+     "remove 'return' statements to apply the result builder", ())
+ERROR(result_builder_infer_ambig, none,
+      "ambiguous result builder inferred for %0: %1 or %2",
       (DeclName, Type, Type))
-NOTE(function_builder_infer_add_return, none,
-     "add an explicit 'return' statement to not use a function builder", ())
-NOTE(function_builder_infer_pick_specific, none,
-     "apply function builder %0 (inferred from %select{protocol|dynamic replacement of}1 %2)",
+NOTE(result_builder_infer_add_return, none,
+     "add an explicit 'return' statement to not use a result builder", ())
+NOTE(result_builder_infer_pick_specific, none,
+     "apply result builder %0 (inferred from %select{protocol|dynamic replacement of}1 %2)",
      (Type, unsigned, DeclName))
-WARNING(function_builder_missing_limited_availability, none,
-        "function builder %0 does not implement 'buildLimitedAvailability'; "
+WARNING(result_builder_missing_limited_availability, none,
+        "result builder %0 does not implement 'buildLimitedAvailability'; "
         "this code may crash on earlier versions of the OS",
         (Type))
-ERROR(function_builder_static_buildblock, none,
-      "function builder must provide at least one static 'buildBlock' "
+ERROR(result_builder_static_buildblock, none,
+      "result builder must provide at least one static 'buildBlock' "
       "method", ())
-NOTE(function_builder_non_static_buildblock, none,
+NOTE(result_builder_non_static_buildblock, none,
      "did you mean to make instance method 'buildBlock' static?", ())
-NOTE(function_builder_buildblock_enum_case, none,
-     "enum case 'buildBlock' cannot be used to satisfy the function builder "
+NOTE(result_builder_buildblock_enum_case, none,
+     "enum case 'buildBlock' cannot be used to satisfy the result builder "
      "requirement", ())
-NOTE(function_builder_buildblock_not_static_method, none,
+NOTE(result_builder_buildblock_not_static_method, none,
      "potential match 'buildBlock' is not a static method", ())
 
-NOTE(function_builder_missing_build_optional, none,
-     "add 'buildOptional(_:)' to the function builder %0 to add support for "
+NOTE(result_builder_missing_build_optional, none,
+     "add 'buildOptional(_:)' to the result builder %0 to add support for "
      "'if' statements without an 'else'", (Type))
-NOTE(function_builder_missing_build_either, none,
-     "add 'buildEither(first:)' and 'buildEither(second:)' to the function "
+NOTE(result_builder_missing_build_either, none,
+     "add 'buildEither(first:)' and 'buildEither(second:)' to the result "
      "builder %0 to add support for 'if'-'else' and 'switch'", (Type))
-NOTE(function_builder_missing_build_array, none,
-     "add 'buildArray(_:)' to the function builder %0 to add support for "
+NOTE(result_builder_missing_build_array, none,
+     "add 'buildArray(_:)' to the result builder %0 to add support for "
      "'for'..'in' loops", (Type))
-NOTE(function_builder_missing_build_limited_availability, none,
-     "add 'buildLimitedAvailability(_:)' to the function "
+NOTE(result_builder_missing_build_limited_availability, none,
+     "add 'buildLimitedAvailability(_:)' to the result "
      "builder %0 to erase type information for less-available types", (Type))
 
 //------------------------------------------------------------------------------

include/swift/AST/EducationalNotes.def

@@ -81,15 +81,15 @@ EDUCATIONAL_NOTES(type_cannot_conform, "protocol-type-non-conformance.md")
 EDUCATIONAL_NOTES(unlabeled_trailing_closure_deprecated,
                   "trailing-closure-matching.md")
 
-EDUCATIONAL_NOTES(function_builder_static_buildblock,
-                  "function-builder-methods.md")
-EDUCATIONAL_NOTES(function_builder_missing_limited_availability,
-                  "function-builder-methods.md")
-EDUCATIONAL_NOTES(function_builder_missing_build_optional,
-                  "function-builder-methods.md")
-EDUCATIONAL_NOTES(function_builder_missing_build_either,
-                  "function-builder-methods.md")
-EDUCATIONAL_NOTES(function_builder_missing_build_array,
-                  "function-builder-methods.md")
+EDUCATIONAL_NOTES(result_builder_static_buildblock,
+                  "result-builder-methods.md")
+EDUCATIONAL_NOTES(result_builder_missing_limited_availability,
+                  "result-builder-methods.md")
+EDUCATIONAL_NOTES(result_builder_missing_build_optional,
+                  "result-builder-methods.md")
+EDUCATIONAL_NOTES(result_builder_missing_build_either,
+                  "result-builder-methods.md")
+EDUCATIONAL_NOTES(result_builder_missing_build_array,
+                  "result-builder-methods.md")
 
 #undef EDUCATIONAL_NOTES

include/swift/AST/Expr.h

@@ -3695,7 +3695,7 @@ class ClosureExpr : public AbstractClosureExpr {
     ReadyForTypeChecking,
 
     /// The body was typechecked with the enclosing closure.
-    /// i.e. single expression closure or function builder closure.
+    /// i.e. single expression closure or result builder closure.
     TypeCheckedWithSignature,
 
     /// The body was type checked separately from the enclosing closure.

include/swift/AST/TypeCheckRequests.h

@@ -735,10 +735,10 @@ void simple_display(llvm::raw_ostream &out, FragileFunctionKind value);
 
 void simple_display(llvm::raw_ostream &out, ResilienceExpansion value);
 
-/// Request the custom attribute which attaches a function builder to the
+/// Request the custom attribute which attaches a result builder to the
 /// given declaration.
-class AttachedFunctionBuilderRequest :
-    public SimpleRequest<AttachedFunctionBuilderRequest,
+class AttachedResultBuilderRequest :
+    public SimpleRequest<AttachedResultBuilderRequest,
                          CustomAttr *(ValueDecl *),
                          RequestFlags::Cached> {
 public:
@@ -756,10 +756,10 @@ class AttachedFunctionBuilderRequest :
   bool isCached() const;
 };
 
-/// Request the function builder type attached to the given declaration,
+/// Request the result builder type attached to the given declaration,
 /// if any.
-class FunctionBuilderTypeRequest :
-    public SimpleRequest<FunctionBuilderTypeRequest,
+class ResultBuilderTypeRequest :
+    public SimpleRequest<ResultBuilderTypeRequest,
                          Type(ValueDecl *),
                          RequestFlags::Cached> {
 public:
@@ -1960,7 +1960,7 @@ class ValueWitnessRequest
   void cacheResult(Witness value) const;
 };
 
-struct PreCheckFunctionBuilderDescriptor {
+struct PreCheckResultBuilderDescriptor {
   AnyFunctionRef Fn;
   bool SuppressDiagnostics;
 
@@ -1972,35 +1972,35 @@ struct PreCheckFunctionBuilderDescriptor {
   BraceStmt *Body;
 
 public:
-  PreCheckFunctionBuilderDescriptor(AnyFunctionRef Fn, bool suppressDiagnostics)
+  PreCheckResultBuilderDescriptor(AnyFunctionRef Fn, bool suppressDiagnostics)
       : Fn(Fn), SuppressDiagnostics(suppressDiagnostics), Body(Fn.getBody()) {}
 
   friend llvm::hash_code
-  hash_value(const PreCheckFunctionBuilderDescriptor &owner) {
+  hash_value(const PreCheckResultBuilderDescriptor &owner) {
     return llvm::hash_combine(owner.Fn, owner.Body);
   }
 
-  friend bool operator==(const PreCheckFunctionBuilderDescriptor &lhs,
-                         const PreCheckFunctionBuilderDescriptor &rhs) {
+  friend bool operator==(const PreCheckResultBuilderDescriptor &lhs,
+                         const PreCheckResultBuilderDescriptor &rhs) {
     return lhs.Fn == rhs.Fn && lhs.Body == rhs.Body;
   }
 
-  friend bool operator!=(const PreCheckFunctionBuilderDescriptor &lhs,
-                         const PreCheckFunctionBuilderDescriptor &rhs) {
+  friend bool operator!=(const PreCheckResultBuilderDescriptor &lhs,
+                         const PreCheckResultBuilderDescriptor &rhs) {
     return !(lhs == rhs);
   }
 
-  friend SourceLoc extractNearestSourceLoc(PreCheckFunctionBuilderDescriptor d) {
+  friend SourceLoc extractNearestSourceLoc(PreCheckResultBuilderDescriptor d) {
     return extractNearestSourceLoc(d.Fn);
   }
 
   friend void simple_display(llvm::raw_ostream &out,
-                             const PreCheckFunctionBuilderDescriptor &d) {
+                             const PreCheckResultBuilderDescriptor &d) {
     simple_display(out, d.Fn);
   }
 };
 
-enum class FunctionBuilderBodyPreCheck : uint8_t {
+enum class ResultBuilderBodyPreCheck : uint8_t {
   /// There were no problems pre-checking the closure.
   Okay,
 
@@ -2011,10 +2011,10 @@ enum class FunctionBuilderBodyPreCheck : uint8_t {
   HasReturnStmt,
 };
 
-class PreCheckFunctionBuilderRequest
-    : public SimpleRequest<PreCheckFunctionBuilderRequest,
-                           FunctionBuilderBodyPreCheck(
-                               PreCheckFunctionBuilderDescriptor),
+class PreCheckResultBuilderRequest
+    : public SimpleRequest<PreCheckResultBuilderRequest,
+                           ResultBuilderBodyPreCheck(
+                               PreCheckResultBuilderDescriptor),
                            RequestFlags::Cached> {
 public:
   using SimpleRequest::SimpleRequest;
@@ -2023,8 +2023,8 @@ class PreCheckFunctionBuilderRequest
   friend SimpleRequest;
 
   // Evaluation.
-  FunctionBuilderBodyPreCheck
-  evaluate(Evaluator &evaluator, PreCheckFunctionBuilderDescriptor owner) const;
+  ResultBuilderBodyPreCheck
+  evaluate(Evaluator &evaluator, PreCheckResultBuilderDescriptor owner) const;
 
 public:
   // Separate caching.
@@ -2759,7 +2759,7 @@ AnyValue::Holder<GenericSignature>::equals(const HolderBase &other) const {
 void simple_display(llvm::raw_ostream &out, Type value);
 void simple_display(llvm::raw_ostream &out, const TypeRepr *TyR);
 void simple_display(llvm::raw_ostream &out, ImplicitMemberAction action);
-void simple_display(llvm::raw_ostream &out, FunctionBuilderBodyPreCheck pck);
+void simple_display(llvm::raw_ostream &out, ResultBuilderBodyPreCheck pck);
 
 #define SWIFT_TYPEID_ZONE TypeChecker
 #define SWIFT_TYPEID_HEADER "swift/AST/TypeCheckerTypeIDZone.def"