Merge pull request #4681 from swiftwasm/release/5.7

[pull] swiftwasm-release/5.7 from release/5.7

Author: kateinoigakukun

include/swift-c/StaticMirror/BinaryScan.h

@@ -25,7 +25,7 @@
 /// SWIFTSTATICMIRROR_VERSION_MINOR should increase when there are API additions.
 /// SWIFTSTATICMIRROR_VERSION_MAJOR is intended for "major" source/ABI breaking changes.
 #define SWIFTSTATICMIRROR_VERSION_MAJOR 0
-#define SWIFTSTATICMIRROR_VERSION_MINOR 3 // Added filed type info gather
+#define SWIFTSTATICMIRROR_VERSION_MINOR 4 // Added opaque associated type's protocol requirements
 
 SWIFTSTATICMIRROR_BEGIN_DECLS
 
@@ -115,6 +115,9 @@ SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t
 SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t
     swift_static_mirror_type_alias_get_substituted_type_mangled_name(
         swift_static_mirror_type_alias_t);
+SWIFTSTATICMIRROR_PUBLIC swiftscan_string_set_t *
+swift_static_mirror_type_alias_get_opaque_type_requirements(
+        swift_static_mirror_type_alias_t);
 
 // swift_static_mirror_associated_type_info query methods
 SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t

include/swift/ABI/GenericContext.h

@@ -145,6 +145,18 @@ class TargetGenericRequirementDescriptor {
     return Protocol;
   }
 
+  /// Retreive the raw value of the Protocol requirement pointer.
+  int32_t getUnresolvedProtocolAddress() const {
+    assert(getKind() == GenericRequirementKind::Protocol);
+    return Protocol.getUnresolvedProtocolAddress();
+  }
+
+  /// Retreive the offset to the Protocol field
+  constexpr inline auto
+  getProtocolOffset() const -> typename Runtime::StoredSize {
+    return offsetof(typename std::remove_reference<decltype(*this)>::type, Protocol);
+  }
+
   /// Retrieve the right-hand type for a SameType or BaseClass requirement.
   llvm::StringRef getMangledTypeName() const {
     assert(getKind() == GenericRequirementKind::SameType ||
@@ -301,7 +313,8 @@ class TargetGenericEnvironment
   }
 };
 
-using GenericEnvironmentDescriptor = TargetGenericEnvironment<InProcess>;
+using GenericEnvironmentDescriptor =
+TargetGenericEnvironment<InProcess>;
 
 /// CRTP class for a context descriptor that includes trailing generic
 /// context description.

include/swift/ABI/Metadata.h

@@ -2996,7 +2996,11 @@ struct TargetOpaqueTypeDescriptor final
     return cd->getKind() == ContextDescriptorKind::OpaqueType;
   }
 };
-  
+
+template <template <typename Runtime> class ObjCInteropKind,
+          unsigned PointerSize>
+using ExternalOpaqueTypeDescriptor = TargetOpaqueTypeDescriptor<
+    External<ObjCInteropKind<RuntimeTarget<PointerSize>>>>;
 using OpaqueTypeDescriptor = TargetOpaqueTypeDescriptor<InProcess>;
 
 /// The instantiation cache for generic metadata.  This must be guaranteed

include/swift/ABI/MetadataRef.h

@@ -308,6 +308,16 @@ class RelativeTargetProtocolDescriptorPointer {
             swiftPointer.getPointer()));
   }
 
+  /// Retrieve a reference to the protocol.
+  int32_t getUnresolvedProtocolAddress() const {
+#if SWIFT_OBJC_INTEROP
+    if (isObjC()) {
+      return objcPointer.getUnresolvedOffset();
+    }
+#endif
+    return swiftPointer.getUnresolvedOffset();
+  }
+
   operator TargetProtocolDescriptorRef<Runtime>() const {
     return getProtocol();
   }

include/swift/AST/ActorIsolation.h

@@ -193,6 +193,9 @@ ActorIsolation getActorIsolation(ValueDecl *value);
 /// Determine how the given declaration context is isolated.
 ActorIsolation getActorIsolationOfContext(DeclContext *dc);
 
+/// Check if both the value, and context are isolated to the same actor.
+bool isSameActorIsolated(ValueDecl *value, DeclContext *dc);
+
 /// Determines whether this function's body uses flow-sensitive isolation.
 bool usesFlowSensitiveIsolation(AbstractFunctionDecl const *fn);
 

include/swift/AST/DiagnosticsSema.def

@@ -4820,9 +4820,6 @@ ERROR(distributed_actor_func_static,none,
 ERROR(distributed_actor_func_not_in_distributed_actor,none,
       "'distributed' method can only be declared within 'distributed actor'",
       ())
-ERROR(distributed_method_requirement_must_be_async_throws,none, // FIXME(distributed): this is an implementation limitation we should lift
-      "'distributed' protocol requirement %0 must currently be declared explicitly 'async throws'",
-      (DeclName))
 ERROR(distributed_actor_user_defined_special_property,none,
       "property %0 cannot be defined explicitly, as it conflicts with "
       "distributed actor synthesized stored property",

include/swift/AST/DistributedDecl.h

@@ -15,8 +15,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_DECL_TYPECHECKDISTRIBUTED_H
-#define SWIFT_DECL_TYPECHECKDISTRIBUTED_H
+#ifndef SWIFT_DECL_DISTRIBUTEDDECL_H
+#define SWIFT_DECL_DISTRIBUTEDDECL_H
 
 #include "swift/AST/ConcreteDeclRef.h"
 #include "swift/AST/DiagnosticEngine.h"
@@ -132,4 +132,6 @@ extractDistributedSerializationRequirements(
 
 }
 
-#endif /* SWIFT_DECL_TYPECHECKDISTRIBUTED_H */
+// ==== ------------------------------------------------------------------------
+
+#endif /* SWIFT_DECL_DISTRIBUTEDDECL_H */

include/swift/Basic/LangOptions.h

@@ -482,13 +482,6 @@ namespace swift {
     // FrontendOptions.
     bool AllowModuleWithCompilerErrors = false;
 
-    /// Enable extensions of (sugared) bound generic types
-    ///
-    /// \code
-    /// extension [Int] { /**/ }
-    /// \endcode
-    bool EnableExperimentalBoundGenericExtensions = false;
-
     /// A helper enum to represent whether or not we customized the default
     /// ASTVerifier behavior via a frontend flag. By default, we do not
     /// customize.

include/swift/Basic/RelativePointer.h

@@ -347,11 +347,7 @@ class RelativeIndirectablePointerIntPair {
 
 public:
   const ValueTy *getPointer() const & {
-    static_assert(alignof(ValueTy) >= 2 && alignof(Offset) >= 2,
-                  "alignment of value and offset must be at least 2 to "
-                  "make room for indirectable flag");
-
-    Offset offset = (RelativeOffsetPlusIndirectAndInt & ~getIntMask());
+    Offset offset = getUnresolvedOffset();
 
     // Check for null.
     if (Nullable && offset == 0)
@@ -370,10 +366,17 @@ class RelativeIndirectablePointerIntPair {
     }
   }
 
+  Offset getUnresolvedOffset() const & {
+    static_assert(alignof(ValueTy) >= 2 && alignof(Offset) >= 2,
+                  "alignment of value and offset must be at least 2 to "
+                  "make room for indirectable flag");
+    Offset offset = (RelativeOffsetPlusIndirectAndInt & ~getIntMask());
+    return offset;
+  }
+
   /// A zero relative offset encodes a null reference.
   bool isNull() const & {
-    Offset offset = (RelativeOffsetPlusIndirectAndInt & ~getIntMask());
-    return offset == 0;
+    return getUnresolvedOffset() == 0;
   }
 
   IntTy getInt() const & {

include/swift/Option/FrontendOptions.td

@@ -313,10 +313,6 @@ def enable_resilience : Flag<["-"], "enable-resilience">,
 def enable_experimental_async_top_level :
   Flag<["-"], "enable-experimental-async-top-level">,
   HelpText<"Enable experimental concurrency in top-level code">;
-
-def enable_experimental_bound_generic_extensions :
-  Flag<["-"], "enable-experimental-bound-generic-extensions">,
-  HelpText<"Enable experimental support for extensions of bound generic types">;
 }
 
 // HIDDEN FLAGS