[Distributed] IRGen: Drop result type for accessor parameters

Author: xedin

lib/IRGen/GenDistributed.cpp

@@ -152,7 +152,7 @@ static CanSILFunctionType getAccessorType(IRGenModule &IGM,
   assert(targetTy->isAsync());
   assert(targetTy->hasErrorResult());
 
-  // Accessor gets argument value buffer and a reference to `self` of
+  // Accessor gets argument/result value buffer and a reference to `self` of
   // the actor and produces a call to the distributed thunk forwarding
   // its result(s) out.
   return SILFunctionType::get(
@@ -161,7 +161,6 @@ static CanSILFunctionType getAccessorType(IRGenModule &IGM,
       {/*argumentBuffer=*/getRawPointerParameter(),
        /*argumentTypes=*/getRawPointerParameter(),
        /*resultBuffer=*/getRawPointerParameter(),
-       /*resultType=*/getRawPointerParameter(),
        /*actor=*/targetTy->getParameters().back()},
       /*Yields=*/{},
       /*Results=*/{},
@@ -438,8 +437,6 @@ void DistributedAccessor::emit() {
   auto *argTypes = params.claimNext();
   // UnsafeRawPointer that is used to store the result.
   auto *resultBuffer = params.claimNext();
-  // `swift.type*` that holds the type fo the result.
-  auto *resultType = params.claimNext();
   // Reference to a `self` of the actor to be called.
   auto *actorSelf = params.claimNext();
 

stdlib/public/Concurrency/Actor.cpp

@@ -1722,14 +1722,15 @@ void *swift_distributed_get_generic_environment(const char *targetNameStart,
 ///    _ targetName: UnsafePointer<UInt8>,
 ///    _ targetNameLength: UInt,
 ///    argumentBuffer: Builtin.RawPointer,
-///    resultBuffer: Builtin.RawPointer) async throws
+///    argumentTypes: UnsafeBufferPointer<Any.Type>,
+///    resultBuffer: Builtin.RawPointer
+/// ) async throws
 using TargetExecutorSignature =
     AsyncSignature<void(/*on=*/DefaultActor *,
                         /*targetName=*/const char *, /*targetNameSize=*/size_t,
                         /*argumentBuffer=*/void *,
                         /*argumentTypes=*/const Metadata *const *,
                         /*resultBuffer=*/void *,
-                        /*resultType=*/const Metadata *,
                         /*resumeFunc=*/TaskContinuationFunction *,
                         /*callContext=*/AsyncContext *),
                    /*throws=*/true>;
@@ -1747,7 +1748,6 @@ using DistributedAccessorSignature =
     AsyncSignature<void(/*argumentBuffer=*/void *,
                         /*argumentTypes=*/const Metadata *const *,
                         /*resultBuffer=*/void *,
-                        /*resultType=*/const Metadata *,
                         /*actor=*/HeapObject *),
                    /*throws=*/true>;
 
@@ -1777,7 +1777,6 @@ void ::swift_distributed_execute_target(
     void *argumentBuffer,
     const Metadata *const *argumentTypes,
     void *resultBuffer,
-    const Metadata *resultType,
     TaskContinuationFunction *resumeFunc,
     AsyncContext *callContext) {
   auto *accessor = findDistributedAccessor(targetNameStart, targetNameLength);
@@ -1813,6 +1812,6 @@ void ::swift_distributed_execute_target(
 
   accessorEntry(calleeContext,
                 argumentBuffer, argumentTypes,
-                resultBuffer, resultType,
+                resultBuffer,
                 actor);
 }

stdlib/public/Distributed/DistributedActorSystem.swift

@@ -307,8 +307,7 @@ extension DistributedActorSystem {
         mangledTargetName, UInt(mangledTargetName.count),
         argumentBuffer: hargs.buffer._rawValue, // TODO(distributed): pass the invocationDecoder instead, so we can decode inside IRGen directly into the argument explosion
         argumentTypes: argumentTypesBuffer.baseAddress!._rawValue,
-        resultBuffer: resultBuffer._rawValue,
-        resultType: returnTypeFromTypeInfo
+        resultBuffer: resultBuffer._rawValue
       )
 
       func onReturn<R>(_ resultTy: R.Type) async throws {
@@ -328,8 +327,7 @@ func _executeDistributedTarget(
   _ targetName: UnsafePointer<UInt8>, _ targetNameLength: UInt,
   argumentBuffer: Builtin.RawPointer, // HeterogeneousBuffer of arguments
   argumentTypes: Builtin.RawPointer,
-  resultBuffer: Builtin.RawPointer,
-  resultType: Any.Type
+  resultBuffer: Builtin.RawPointer
 ) async throws
 
 // ==== ----------------------------------------------------------------------------------------------------------------

test/Distributed/distributed_actor_accessor_thunks_64bit.swift

@@ -90,7 +90,7 @@ public distributed actor MyOtherActor {
 
 // CHECK: define hidden swifttailcc void @"$s27distributed_actor_accessors7MyActorC7simple1yySiFTE"
 
-// CHECK: define internal swifttailcc void @"$s27distributed_actor_accessors7MyActorC7simple1yySiFTETF"(%swift.context* swiftasync %0, i8* %1, i8* %2, i8* %3, i8* %4, %T27distributed_actor_accessors7MyActorC* %5)
+// CHECK: define internal swifttailcc void @"$s27distributed_actor_accessors7MyActorC7simple1yySiFTETF"(%swift.context* swiftasync %0, i8* %1, i8* %2, i8* %3, %T27distributed_actor_accessors7MyActorC* %4)
 
 /// Read the current offset and cast an element to `Int`
 
@@ -113,7 +113,7 @@ public distributed actor MyOtherActor {
 // CHECK-SAME: i8* bitcast (void (%swift.context*, i64, %T27distributed_actor_accessors7MyActorC*)* @"$s27distributed_actor_accessors7MyActorC7simple1yySiFTE" to i8*),
 // CHECK-SAME: %swift.context* [[THUNK_CONTEXT_PTR]],
 // CHECK-SAME: i64 [[ARG_VAL]],
-// CHECK-SAME: %T27distributed_actor_accessors7MyActorC* %5)
+// CHECK-SAME: %T27distributed_actor_accessors7MyActorC* %4)
 
 // CHECK-NEXT: [[TASK_REF:%.*]] = extractvalue { i8*, %swift.error* } [[THUNK_RESULT]], 0
 // CHECK-NEXT: {{.*}} = call i8* @__swift_async_resume_project_context(i8* [[TASK_REF]])
@@ -141,7 +141,7 @@ public distributed actor MyOtherActor {
 // CHECK-SAME: i8* bitcast (void (%swift.context*, i64, %T27distributed_actor_accessors7MyActorC*)* @"$s27distributed_actor_accessors7MyActorC7simple2ySSSiFTE" to i8*),
 // CHECK-SAME: %swift.context* [[THUNK_CONTEXT_PTR]],
 // CHECK-SAME: i64 [[NATIVE_ARG_VAL]],
-// CHECK-SAME: %T27distributed_actor_accessors7MyActorC* %5)
+// CHECK-SAME: %T27distributed_actor_accessors7MyActorC* %4)
 
 // CHECK-NEXT: [[TASK_REF:%.*]] = extractvalue { i8*, i64, %swift.bridge*, %swift.error* } [[THUNK_RESULT]], 0
 // CHECK-NEXT: {{.*}} = call i8* @__swift_async_resume_project_context(i8* [[TASK_REF]])
@@ -164,7 +164,7 @@ public distributed actor MyOtherActor {
 // CHECK: define hidden swifttailcc void @"$s27distributed_actor_accessors7MyActorC7simple3ySiSSFTE"
 
 /// !!! in `simple3` interesting bits are: argument value extraction (because string is exploded into N arguments) and call to distributed thunk
-// CHECK: define internal swifttailcc void @"$s27distributed_actor_accessors7MyActorC7simple3ySiSSFTETF"(%swift.context* swiftasync {{.*}}, i8* [[ARG_BUFF:%.*]], i8* [[ARG_TYPES:%.*]], i8* [[RESULT_BUFF:%.*]], {{.*}}, %T27distributed_actor_accessors7MyActorC* {{.*}})
+// CHECK: define internal swifttailcc void @"$s27distributed_actor_accessors7MyActorC7simple3ySiSSFTETF"(%swift.context* swiftasync {{.*}}, i8* [[ARG_BUFF:%.*]], i8* [[ARG_TYPES:%.*]], i8* [[RESULT_BUFF:%.*]], %T27distributed_actor_accessors7MyActorC* {{.*}})
 
 // CHECK: [[TYPED_RESULT_BUFF:%.*]] = bitcast i8* [[RESULT_BUFF]] to %TSi*
 
@@ -188,7 +188,7 @@ public distributed actor MyOtherActor {
 // CHECK-SAME: %swift.context* [[THUNK_CONTEXT_PTR]],
 // CHECK-SAME: i64 [[STR_SIZE]],
 // CHECK-SAME: %swift.bridge* [[STR_VAL]],
-// CHECK-SAME: %T27distributed_actor_accessors7MyActorC* %5)
+// CHECK-SAME: %T27distributed_actor_accessors7MyActorC* %4)
 
 // CHECK-NEXT: [[TASK_REF:%.*]] = extractvalue { i8*, i64, %swift.error* } [[THUNK_RESULT]], 0
 // CHECK-NEXT: {{.*}} = call i8* @__swift_async_resume_project_context(i8* [[TASK_REF]])
@@ -201,7 +201,7 @@ public distributed actor MyOtherActor {
 
 // CHECK: define hidden swifttailcc void @"$s27distributed_actor_accessors7MyActorC16single_case_enumyAA7SimpleEOAFFTE"
 
-// CHECK: define internal swifttailcc void @"$s27distributed_actor_accessors7MyActorC16single_case_enumyAA7SimpleEOAFFTETF"(%swift.context* swiftasync %0, i8* [[BUFFER:%.*]], i8* [[ARG_TYPES:%.*]], i8* [[RESULT_BUFF:%.*]], {{.*}}, %T27distributed_actor_accessors7MyActorC* {{.*}})
+// CHECK: define internal swifttailcc void @"$s27distributed_actor_accessors7MyActorC16single_case_enumyAA7SimpleEOAFFTETF"(%swift.context* swiftasync %0, i8* [[BUFFER:%.*]], i8* [[ARG_TYPES:%.*]], i8* [[RESULT_BUFF:%.*]], %T27distributed_actor_accessors7MyActorC* {{.*}})
 
 /// First, let's check that there were no loads from the argument buffer and no stores to "current offset".
 
@@ -256,7 +256,7 @@ public distributed actor MyOtherActor {
 
 // CHECK: define hidden swifttailcc void @"$s27distributed_actor_accessors7MyActorC7complexyAA11LargeStructVSaySiG_AA3ObjCSSSgAFtFTE"
 
-// CHECK: define internal swifttailcc void @"$s27distributed_actor_accessors7MyActorC7complexyAA11LargeStructVSaySiG_AA3ObjCSSSgAFtFTETF"(%swift.context* swiftasync {{.*}}, i8* [[ARG_BUFF:%.*]], i8* [[ARG_TYPES:%.*]], i8* [[RESULT_BUFF:%.*]], {{.*}}, %T27distributed_actor_accessors7MyActorC* {{.*}})
+// CHECK: define internal swifttailcc void @"$s27distributed_actor_accessors7MyActorC7complexyAA11LargeStructVSaySiG_AA3ObjCSSSgAFtFTETF"(%swift.context* swiftasync {{.*}}, i8* [[ARG_BUFF:%.*]], i8* [[ARG_TYPES:%.*]], i8* [[RESULT_BUFF:%.*]], %T27distributed_actor_accessors7MyActorC* {{.*}})
 
 /// First, let's check that all of the different argument types here are loaded correctly.
 
@@ -317,7 +317,7 @@ public distributed actor MyOtherActor {
 
 /// Let's check that there is no offset allocation here since parameter list is empty
 
-// CHECK: define internal swifttailcc void @"$s27distributed_actor_accessors12MyOtherActorC5emptyyyFTETF"(%swift.context* swiftasync {{.*}}, i8* [[ARG_BUFF:%.*]], i8* [[ARG_TYPES:%.*]], i8* [[RESULT_BUFF:%.*]], {{.*}}, %T27distributed_actor_accessors12MyOtherActorC* {{.*}})
+// CHECK: define internal swifttailcc void @"$s27distributed_actor_accessors12MyOtherActorC5emptyyyFTETF"(%swift.context* swiftasync {{.*}}, i8* [[ARG_BUFF:%.*]], i8* [[ARG_TYPES:%.*]], i8* [[RESULT_BUFF:%.*]], %T27distributed_actor_accessors12MyOtherActorC* {{.*}})
 // CHECK-NEXT: entry:
 // CHECK-NEXT: {{.*}} = alloca %swift.context*
 // CHECK-NEXT: %swifterror = alloca swifterror %swift.error*