Merge pull request #41155 from ktoso/wip-fix-asan-dist

Author: swift-ci

lib/SIL/Verifier/SILVerifier.cpp

@@ -5545,11 +5545,6 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
           if (term->isFunctionExiting()) {
             require(state.Stack.empty(),
                     "return with stack allocs that haven't been deallocated");
-            if (!state.ActiveOps.empty()) {
-              for (auto op : state.ActiveOps) {
-                op->dump();
-              }
-            }
             require(state.ActiveOps.empty(),
                     "return with operations still active");
             require(!state.GotAsyncContinuation,

lib/SILGen/SILGenDistributed.cpp

@@ -1016,7 +1016,6 @@ void SILGenFunction::emitDistributedThunk(SILDeclRef thunk) {
           SmallVector<Type, 1> subTypes;
           SmallVector<ProtocolConformanceRef, 2> subConformances;
 
-          //          subTypes.push_back(paramTy.getASTType());
           subTypes.push_back(paramTy);
 
           subs = SubstitutionMap::get(recordArgumentGenericSig, subTypes,
@@ -1535,16 +1534,14 @@ void SILGenFunction::emitDistributedThunk(SILDeclRef thunk) {
     }
     {
       // FIXME(distributed): manual since I could not figure out how to NOT destroy_addr in the error path, where the memory is not initialized, so the destroy would fail SIL verification
-//      emitThrowWithCleanupBasicBlock(*this, loc, thunk, remoteCallErrorBB, errorBB,
-//                                     /*endAccesses*/{invocationEncoderAccess},
-//                                     /*endLifetimes*/{remoteCallSystemSelf});
+      //      emitThrowWithCleanupBasicBlock(*this, loc, thunk, remoteCallErrorBB, errorBB,
+      //                                     /*endAccesses*/{invocationEncoderAccess},
+      //                                     /*endLifetimes*/{remoteCallSystemSelf});
       B.emitBlock(remoteCallErrorBB);
       SILValue error = remoteCallErrorBB->createPhiArgument(
           fnConv.getSILErrorType(getTypeExpansionContext()),
           OwnershipKind::Owned);
 
-      //      auto result = remoteCallReturnValue.getValue();
-
       // TODO(distributed): make those into cleanups
       B.createEndAccess(loc, invocationEncoderAccess, /*aborted=*/false);
 

lib/Sema/CodeSynthesisDistributedActor.cpp

@@ -145,10 +145,19 @@ VarDecl *GetDistributedActorSystemPropertyRequest::evaluate(
   if (!C.getLoadedModule(C.Id_Distributed))
     return nullptr;
 
-
-  if (auto system = actor->lookupDirect(C.Id_actorSystem).begin()) {
-    // TODO(distributed): may need to check conformance here?
-    return dyn_cast<VarDecl>(*system);
+  auto module = C.getStdlibModule();
+  auto DistSystemProtocol =
+      C.getProtocol(KnownProtocolKind::DistributedActorSystem);
+
+  for (auto system : actor->lookupDirect(C.Id_actorSystem)) {
+    if (auto var = dyn_cast<VarDecl>(system)) {
+      auto conformance = module->conformsToProtocol(var->getInterfaceType(),
+                                                    DistSystemProtocol);
+      if (conformance.isInvalid())
+        continue;
+
+      return var;
+    }
   }
 
   return nullptr;

test/Distributed/Inputs/FakeDistributedActorSystems.swift

@@ -327,12 +327,12 @@ public class FakeInvocationDecoder : DistributedTargetInvocationDecoder {
   }
 
   public func decodeErrorType() throws -> Any.Type? {
-    print("  > decode return type: \(errorType.map { String(describing: $0) }  ?? "nil")")
+    print("  > decode return type: \(errorType.map { String(reflecting: $0) }  ?? "nil")")
     return self.errorType
   }
 
   public func decodeReturnType() throws -> Any.Type? {
-    print("  > decode return type: \(returnType.map { String(describing: $0) }  ?? "nil")")
+    print("  > decode return type: \(returnType.map { String(reflecting: $0) }  ?? "nil")")
     return self.returnType
   }
 }

test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_echo.swift

@@ -21,7 +21,7 @@
 // UNSUPPORTED: OS=watchos && CPU=i386
 
 // rdar://88228867 - remoteCall_* tests have been disabled due to random failures
-// REQUIRES: rdar88228867
+// OK: rdar88228867
 
 import _Distributed
 import FakeDistributedActorSystems

test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_empty.swift

@@ -21,7 +21,7 @@
 // UNSUPPORTED: OS=watchos && CPU=i386
 
 // rdar://88228867 - remoteCall_* tests have been disabled due to random failures
-// REQUIRES: rdar88228867
+// OK: rdar88228867
 
 import _Distributed
 import FakeDistributedActorSystems

test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_genericActor.swift

@@ -21,7 +21,7 @@
 // UNSUPPORTED: OS=watchos && CPU=i386
 
 // rdar://88228867 - remoteCall_* tests have been disabled due to random failures
-// REQUIRES: rdar88228867
+// OK: rdar88228867
 
 import _Distributed
 import FakeDistributedActorSystems

test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_genericFunc.swift

@@ -21,7 +21,7 @@
 // UNSUPPORTED: OS=watchos && CPU=i386
 
 // rdar://88228867 - remoteCall_* tests have been disabled due to random failures
-// REQUIRES: rdar88228867
+// OK: rdar88228867
 
 import _Distributed
 import FakeDistributedActorSystems

test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_hello.swift

@@ -21,7 +21,7 @@
 // UNSUPPORTED: OS=watchos && CPU=i386
 
 // rdar://88228867 - remoteCall_* tests have been disabled due to random failures
-// REQUIRES: rdar88228867
+// OK: rdar88228867
 
 import _Distributed
 import FakeDistributedActorSystems
@@ -41,7 +41,7 @@ func test() async throws {
   let ref = try Greeter.resolve(id: local.id, using: system)
 
   try await ref.take(name: "Caplin")
-  // CHECK: >> remoteCallVoid: on:main.Greeter), target:RemoteCallTarget(_mangledName: "$s4main7GreeterC4take4nameySS_tFTE"), invocation:FakeInvocationEncoder(genericSubs: [], arguments: ["Caplin"], returnType: nil, errorType: nil), throwing:Swift.Never
+  // CHECK: >> remoteCallVoid: on:main.Greeter, target:RemoteCallTarget(_mangledName: "$s4main7GreeterC4take4nameySS_tFTE"), invocation:FakeInvocationEncoder(genericSubs: [], arguments: ["Caplin"], returnType: nil, errorType: nil), throwing:Swift.Never
   // CHECK: take: Caplin
 
 }

test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_take.swift

@@ -21,7 +21,7 @@
 // UNSUPPORTED: OS=watchos && CPU=i386
 
 // rdar://88228867 - remoteCall_* tests have been disabled due to random failures
-// REQUIRES: rdar88228867
+// OK: rdar88228867
 
 import _Distributed
 import FakeDistributedActorSystems

test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_takeThrowReturn.swift

@@ -21,7 +21,7 @@
 // UNSUPPORTED: OS=watchos && CPU=i386
 
 // rdar://88228867 - remoteCall_* tests have been disabled due to random failures
-// REQUIRES: rdar88228867
+// OK: rdar88228867
 
 import _Distributed
 import FakeDistributedActorSystems

test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_take_two.swift

@@ -21,7 +21,7 @@
 // UNSUPPORTED: OS=watchos && CPU=i386
 
 // rdar://88228867 - remoteCall_* tests have been disabled due to random failures
-// REQUIRES: rdar88228867
+// OK: rdar88228867
 
 import _Distributed
 import FakeDistributedActorSystems

test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_throw.swift

@@ -20,7 +20,7 @@
 // UNSUPPORTED: linux
 
 // rdar://88228867 - remoteCall_* tests have been disabled due to random failures
-// REQUIRES: rdar88228867
+// OK: rdar88228867
 
 import _Distributed
 import FakeDistributedActorSystems
@@ -54,10 +54,10 @@ func test() async throws {
   let reply = try await ref.echo(name: "Caplin")
   // CHECK: > encode argument: Caplin
   // CHECK-NOT: > encode error type
-  // CHECK: > encode return type: String
+  // CHECK: > encode return type: Swift.String
   // CHECK: > done recording
   // CHECK: >> remoteCall
-  // CHECK: > decode return type: String
+  // CHECK: > decode return type: Swift.String
   // CHECK: > decode argument: Caplin
   // CHECK: << onReturn: Echo: Caplin (impl on: ActorAddress(address: "<unique-id>"))