Merge pull request #3779 from swiftwasm/main

[pull] swiftwasm from main

Author: MaxDesiatov

lib/IRGen/IRGenDebugInfo.cpp

@@ -884,7 +884,9 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
     Mangle::ASTMangler Mangler;
     std::string Result = Mangler.mangleTypeForDebugger(Ty, Sig);
 
-    if (!Opts.DisableRoundTripDebugTypes) {
+    // TODO(SR-15377): We currently cannot round trip some C++ types.
+    if (!Opts.DisableRoundTripDebugTypes &&
+        !Ty->getASTContext().LangOpts.EnableCXXInterop) {
       // Make sure we can reconstruct mangled types for the debugger.
 #ifndef NDEBUG
       auto &Ctx = Ty->getASTContext();

stdlib/public/Distributed/DistributedActor.swift

@@ -35,7 +35,7 @@ public protocol AnyActor: Sendable, AnyObject {}
 /// distributed actor.
 @available(SwiftStdlib 5.5, *)
 public protocol DistributedActor:
-    AnyActor, Identifiable, Hashable, Codable {
+    AnyActor, Sendable, Identifiable, Hashable, Codable {
     /// Resolves the passed in `identity` against the `transport`, returning
     /// either a local or remote actor reference.
     ///

test/Distributed/distributed_actor_concurrency_warnings.swift

@@ -0,0 +1,12 @@
+// RUN: %target-typecheck-verify-swift -warn-concurrency -enable-experimental-distributed -disable-availability-checking
+// REQUIRES: concurrency
+// REQUIRES: distributed
+
+import _Distributed
+
+actor Charlie {
+    // should not cause sendable warnings, Worker is Sendable as implied by DA
+    func two<Worker>() -> Set<Worker> where Worker: DistributedActor {
+        []
+    }
+}