wip

Author: ktoso

lib/IRGen/GenDistributed.cpp

@@ -230,14 +230,14 @@ static CanSILFunctionType getAccessorType(IRGenModule &IGM,
 
   // actor
 
-  auto actorTypeParam =
-      GenericTypeParamType::get(/*isParameterPack=*/false,
-                                /*depth=*/0, /*index=*/1, Context);
-    parameters.push_back(
-        GenericFunctionType::Param(actorTypeParam));
-  auto distributedActorTy =
-        Context.getDistributedActorDecl()
-        ->getDeclaredInterfaceType();
+//  auto actorTypeParam =
+//      GenericTypeParamType::get(/*isParameterPack=*/false,
+//                                /*depth=*/0, /*index=*/1, Context);
+//    parameters.push_back(
+//        GenericFunctionType::Param(actorTypeParam));
+//  auto distributedActorTy =
+//        Context.getDistributedActorDecl()
+//        ->getDeclaredInterfaceType();
 
   auto decoderProtocolTy =
       Context
@@ -260,10 +260,10 @@ static CanSILFunctionType getAccessorType(IRGenModule &IGM,
     genericRequirements.push_back(
         {RequirementKind::Conformance, decoderType, decoderProtocolTy});
 
-    genericRequirements.push_back(
-        {RequirementKind::Conformance, actorTypeParam, distributedActorTy});
-
-    genericParams.push_back(actorTypeParam);
+//    genericRequirements.push_back(
+//        {RequirementKind::Conformance, actorTypeParam, distributedActorTy});
+//
+//    genericParams.push_back(actorTypeParam);
 
     signature = buildGenericSignature(Context, GenericSignature(),
                                       std::move(genericParams),
@@ -603,14 +603,14 @@ void DistributedAccessor::emit() {
   // Metadata that represents passed in the invocation decoder.
   auto *decoderType = params.claimNext();
 
-  // Metadata that represents the actor the invocation is on.
-  auto *actorType = params.claimNext();
-  (void)actorType;
+//  // Metadata that represents the actor the invocation is on.
+//  auto *actorType = params.claimNext();
+//  (void)actorType;
 
   // Witness table for decoder conformance to DistributedTargetInvocationDecoder
   auto *decoderProtocolWitness = params.claimNext();
-  auto *distributedActorWitness = params.claimNext();
-  (void)distributedActorWitness;
+//  auto *distributedActorWitness = params.claimNext();
+//  (void)distributedActorWitness;
 
   // Preliminary: Setup async context for this accessor.
   {

stdlib/public/Distributed/DistributedActor.cpp

@@ -61,9 +61,10 @@ using TargetExecutorSignature =
                         /*witnessTables=*/void **,
                         /*numWitnessTables=*/size_t,
                         /*decoderType=*/Metadata *,
-                        /*actorType=*/Metadata *,
-                        /*decoderWitnessTable=*/void **,
-                        /*distributedActorWitnessTable=*/void **
+//                        /*actorType=*/Metadata *,
+                        /*decoderWitnessTable=*/void **
+//                        ,
+//                        /*distributedActorWitnessTable=*/void **
                         ),
                    /*throws=*/true>;
 
@@ -91,9 +92,11 @@ using DistributedAccessorSignature =
                         /*numWitnessTables=*/size_t,
                         /*actor=*/HeapObject *,
                         /*decoderType=*/Metadata *,
-                        /*actorType=*/Metadata *,
-                        /*decoderWitnessTable=*/void **,
-                        /*actorWitnessTable=*/void **),
+//                        /*actorType=*/Metadata *,
+                        /*decoderWitnessTable=*/void **
+//                        ,
+//                        /*actorWitnessTable=*/void **
+                        ),
                    /*throws=*/true>;
 
 SWIFT_CC(swiftasync)
@@ -129,9 +132,11 @@ void swift_distributed_execute_target(
     void **witnessTables,
     size_t numWitnessTables,
     Metadata *decoderType,
-    Metadata *actorType,
-    void **decoderWitnessTable,
-    void **actorWitnessTable) {
+//    Metadata *actorType,
+    void **decoderWitnessTable
+//    ,
+//    void **actorWitnessTable
+    ) {
   auto *accessor = findDistributedAccessor(targetNameStart, targetNameLength);
   if (!accessor) {
     SwiftError *error =
@@ -166,7 +171,9 @@ void swift_distributed_execute_target(
                 numWitnessTables,
                 actor,
                 decoderType,
-                actorType,
-                decoderWitnessTable,
-                actorWitnessTable);
+//                actorType,
+                decoderWitnessTable
+//                ,
+//                actorWitnessTable
+                );
 }

stdlib/public/Distributed/DistributedActorSystem.swift

@@ -652,8 +652,8 @@ public struct RemoteCallTarget: CustomStringConvertible, Hashable {
 
 @available(SwiftStdlib 5.7, *)
 @_silgen_name("swift_distributed_execute_target")
-func _executeDistributedTarget<D: DistributedTargetInvocationDecoder, DA: DistributedActor>(
-  on actor: DA, // DistributedActor
+func _executeDistributedTarget<D: DistributedTargetInvocationDecoder>(
+  on actor: AnyObject, // : DistributedActor
   _ targetName: UnsafePointer<UInt8>, _ targetNameLength: UInt,
   argumentDecoder: inout D,
   argumentTypes: Builtin.RawPointer,