Merge pull request #3996 from swiftwasm/main

Author: MaxDesiatov

cmake/modules/AddSwift.cmake

@@ -560,16 +560,24 @@ function(add_swift_host_library name)
 
     if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL MSVC)
       swift_windows_get_sdk_vfs_overlay(ASHL_VFS_OVERLAY)
-      target_compile_options(${name} PRIVATE
-        $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:"SHELL:-Xclang -ivfsoverlay -Xclang ${ASHL_VFS_OVERLAY}">)
-
-      # MSVC doesn't support -Xclang. We don't need to manually specify
-      # the dependent libraries as `cl` does so.
-      target_compile_options(${name} PRIVATE
-        $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:"SHELL:-Xclang --dependent-lib=oldnames">
-        # TODO(compnerd) handle /MT, /MTd
-        $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:"SHELL:-Xclang --dependent-lib=msvcrt$<$<CONFIG:Debug>:d>">
-        )
+      # Both clang and clang-cl on Windows set CMAKE_C_SIMULATE_ID to MSVC.
+      # We are using CMAKE_C_COMPILER_FRONTEND_VARIANT to detect the correct
+      # way to pass -Xclang arguments.
+      if ("${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "MSVC")
+        target_compile_options(${name} PRIVATE
+          $<$<COMPILE_LANGUAGE:C,CXX>:SHELL:/clang:-Xclang /clang:-ivfsoverlay /clang:-Xclang /clang:${ASHL_VFS_OVERLAY}>)
+      else()
+        target_compile_options(${name} PRIVATE
+          $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:"SHELL:-Xclang -ivfsoverlay -Xclang ${ASHL_VFS_OVERLAY}">)
+
+          # MSVC doesn't support -Xclang. We don't need to manually specify
+          # the dependent libraries as `cl`/`clang-cl` does so.
+          target_compile_options(${name} PRIVATE
+            $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:"SHELL:-Xclang --dependent-lib=oldnames">
+            # TODO(compnerd) handle /MT, /MTd
+            $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:"SHELL:-Xclang --dependent-lib=msvcrt$<$<CONFIG:Debug>:d>">
+            )
+      endif()
     endif()
 
     set_target_properties(${name} PROPERTIES
@@ -980,9 +988,12 @@ function(add_swift_host_tool executable)
     target_include_directories(${executable} SYSTEM PRIVATE
       ${${SWIFT_HOST_VARIANT_ARCH}_INCLUDE})
 
-    if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL MSVC)
+    # On Windows both clang-cl and clang simulate MSVC.
+    # We are using CMAKE_C_COMPILER_FRONTEND_VARIANT to distinguish
+    # clang from clang-cl.
+    if(NOT "${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC" AND NOT "${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "MSVC")
       # MSVC doesn't support -Xclang. We don't need to manually specify
-      # the dependent libraries as `cl` does so.
+      # the dependent libraries as `cl`/`clang-cl` does so.
       target_compile_options(${executable} PRIVATE
         $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:"SHELL:-Xclang --dependent-lib=oldnames">
         # TODO(compnerd) handle /MT, /MTd

cmake/modules/SwiftWindowsSupport.cmake

@@ -92,9 +92,17 @@ macro(swift_swap_compiler_if_needed target)
       if("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
         set(CMAKE_C_COMPILER ${CLANG_LOCATION}/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
         set(CMAKE_CXX_COMPILER ${CLANG_LOCATION}/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
+        set(CMAKE_C_COMPILER_ID Clang)
+        set(CMAKE_C_SIMULATE_ID MSVC)
+        set(CMAKE_C_COMPILER_FRONTEND_VARIANT MSVC)
+        set(CMAKE_CXX_COMPILER_ID Clang)
+        set(CMAKE_CXX_SIMULATE_ID MSVC)
+        set(CMAKE_CXX_COMPILER_FRONTEND_VARIANT MSVC)
       else()
         set(CMAKE_C_COMPILER ${CLANG_LOCATION}/clang${CMAKE_EXECUTABLE_SUFFIX})
         set(CMAKE_CXX_COMPILER ${CLANG_LOCATION}/clang++${CMAKE_EXECUTABLE_SUFFIX})
+        set(CMAKE_C_COMPILER_ID Clang)
+        set(CMAKE_CXX_COMPILER_ID Clang)
       endif()
     else()
       message(SEND_ERROR "${target} requires a clang based compiler")

include/swift/ABI/TaskGroup.h

@@ -42,6 +42,10 @@ class alignas(Alignment_TaskGroup) TaskGroup {
 
   /// Checks the cancellation status of the group.
   bool isCancelled();
+
+  // Add a child task to the group. Always called with the status record lock of
+  // the parent task held
+  void addChildTask(AsyncTask *task);
 };
 
 } // end namespace swift

include/swift/AST/Decl.h

@@ -3309,6 +3309,9 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
   /// If the passed in function is not distributed this function returns null.
   AbstractFunctionDecl* lookupDirectRemoteFunc(AbstractFunctionDecl *func);
 
+  /// Find, or potentially synthesize, the implicit 'id' property of this actor.
+  ValueDecl *getDistributedActorIDProperty() const;
+
   /// Collect the set of protocols to which this type should implicitly
   /// conform, such as AnyObject (for classes).
   void getImplicitProtocols(SmallVectorImpl<ProtocolDecl *> &protocols);

include/swift/AST/DiagnosticsSema.def

@@ -4681,13 +4681,13 @@ 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_actor_designated_ctor_must_have_one_transport_param,none,
+ERROR(distributed_actor_designated_ctor_must_have_one_distributedactorsystem_param,none,
       "designated distributed actor initializer %0 must accept exactly one "
-      "ActorTransport parameter, found %1",
+      "DistributedActorSystem parameter, found %1",
       (DeclName, int))
 ERROR(distributed_actor_designated_ctor_missing_transport_param,none,
       "designated distributed actor initializer %0 is missing required "
-      "ActorTransport parameter",
+      "DistributedActorSystem parameter",
       (DeclName))
 ERROR(distributed_actor_user_defined_special_property,none,
       "property %0 cannot be defined explicitly, as it conflicts with "

include/swift/AST/Expr.h

@@ -1239,7 +1239,7 @@ class DeclRefExpr : public Expr {
 
   /// Set whether this reference must account for a `throw` occurring for reasons
   /// other than the function implementation itself throwing, e.g. an
-  /// `ActorTransport` implementing a `distributed func` call throwing a
+  /// `DistributedActorSystem` implementing a `distributed func` call throwing a
   /// networking error.
   void setImplicitlyThrows(bool isImplicitlyThrows) {
     Bits.DeclRefExpr.IsImplicitlyThrows = isImplicitlyThrows;
@@ -1619,7 +1619,7 @@ class LookupExpr : public Expr {
 
   /// Set whether this reference must account for a `throw` occurring for reasons
   /// other than the function implementation itself throwing, e.g. an
-  /// `ActorTransport` implementing a `distributed func` call throwing a
+  /// `DistributedActorSystem` implementing a `distributed func` call throwing a
   /// networking error.
   void setImplicitlyThrows(bool isImplicitlyThrows) {
     Bits.LookupExpr.IsImplicitlyThrows = isImplicitlyThrows;
@@ -3615,6 +3615,9 @@ class AbstractClosureExpr : public DeclContext, public Expr {
   /// \brief Return whether this closure is async when fully applied.
   bool isBodyAsync() const;
 
+  /// Whether this closure is Sendable.
+  bool isSendable() const;
+
   /// Whether this closure consists of a single expression.
   bool hasSingleExpressionBody() const;
 

include/swift/AST/KnownIdentifiers.def

@@ -65,7 +65,7 @@ IDENTIFIER(decode)
 IDENTIFIER(decodeIfPresent)
 IDENTIFIER(Decoder)
 IDENTIFIER(decoder)
-IDENTIFIER(DefaultActorTransport)
+IDENTIFIER(DefaultDistributedActorSystem)
 IDENTIFIER_(Differentiation)
 IDENTIFIER_WITH_NAME(PatternMatchVar, "$match")
 IDENTIFIER(dynamicallyCall)
@@ -142,7 +142,6 @@ IDENTIFIER_WITH_NAME(SwiftObject, "_TtCs12_SwiftObject")
 IDENTIFIER(SwiftNativeNSObject)
 IDENTIFIER(to)
 IDENTIFIER(toRaw)
-IDENTIFIER(Transport)
 IDENTIFIER(Type)
 IDENTIFIER(type)
 IDENTIFIER(typeMismatch)
@@ -256,18 +255,20 @@ IDENTIFIER_(regexString)
 IDENTIFIER_(StringProcessing)
 
 // Distributed actors
-IDENTIFIER(transport)
-IDENTIFIER(using)
 IDENTIFIER(actor)
-IDENTIFIER(actorTransport)
-IDENTIFIER(actorType)
 IDENTIFIER(actorReady)
-IDENTIFIER(assignIdentity)
-IDENTIFIER(resignIdentity)
+IDENTIFIER(ActorSystem)
+IDENTIFIER(actorSystem)
+IDENTIFIER(ActorID)
+IDENTIFIER(actorType)
+IDENTIFIER(using)
+IDENTIFIER(assignID)
+IDENTIFIER(resignID)
 IDENTIFIER(resolve)
+IDENTIFIER(system)
+IDENTIFIER(ID)
 IDENTIFIER(id)
-IDENTIFIER(identity)
-IDENTIFIER(identifier)
+IDENTIFIER(Invocation)
 IDENTIFIER(_distributedActorRemoteInitialize)
 IDENTIFIER(_distributedActorDestroy)
 IDENTIFIER(__isRemoteActor)

include/swift/AST/KnownProtocols.def

@@ -98,7 +98,7 @@ PROTOCOL(Differentiable)
 // Distributed Actors
 PROTOCOL(DistributedActor)
 PROTOCOL(ActorIdentity)
-PROTOCOL(ActorTransport)
+PROTOCOL(DistributedActorSystem)
 
 PROTOCOL(AsyncSequence)
 PROTOCOL(AsyncIteratorProtocol)

include/swift/AST/KnownSDKDecls.def

@@ -19,7 +19,7 @@
 #  define KNOWN_SDK_FUNC_DECL(Module, Name, Id)
 #endif
 
-KNOWN_SDK_FUNC_DECL(Distributed, MissingDistributedActorTransport, "_missingDistributedActorTransport")
+KNOWN_SDK_FUNC_DECL(Distributed, MissingDistributedActorSystem, "_missingDistributedActorSystem")
 KNOWN_SDK_FUNC_DECL(Distributed, IsRemoteDistributedActor, "__isRemoteActor")
 
 #undef KNOWN_SDK_FUNC_DECL

include/swift/AST/PrintOptions.h

@@ -95,7 +95,6 @@ class AnyAttrKind {
     static_assert(DAK_Count < UINT_MAX, "DeclAttrKind is > 31 bits");
   }
   AnyAttrKind() : kind(TAK_Count), isType(1) {}
-  AnyAttrKind(const AnyAttrKind &) = default;
 
   /// Returns the TypeAttrKind, or TAK_Count if this is not a type attribute.
   TypeAttrKind type() const {