[Distributed] Stage use of generic environment to decode target parameter/result types

Author: xedin

stdlib/public/Distributed/DistributedActorSystem.swift

@@ -168,6 +168,13 @@ extension DistributedActorSystem {
 
     // Get the expected parameter count of the func
     let nameUTF8 = Array(mangledTargetName.utf8)
+
+    // Gen the generic environment (if any) associated with the target.
+    let genericEnv = nameUTF8.withUnsafeBufferPointer { nameUTF8 in
+      _getGenericEnvironmentOfDistributedTarget(nameUTF8.baseAddress!,
+                                                UInt(nameUTF8.endIndex))
+    }
+
     let paramCount = nameUTF8.withUnsafeBufferPointer { nameUTF8 in
       __getParameterCount(nameUTF8.baseAddress!, UInt(nameUTF8.endIndex))
     }
@@ -193,6 +200,7 @@ extension DistributedActorSystem {
     let decodedNum = nameUTF8.withUnsafeBufferPointer { nameUTF8 in
       __getParameterTypeInfo(
         nameUTF8.baseAddress!, UInt(nameUTF8.endIndex),
+        genericEnv,
         paramTypesBuffer.baseAddress!._rawValue, Int(paramCount))
     }
 
@@ -220,7 +228,8 @@ extension DistributedActorSystem {
       return UnsafeRawPointer(UnsafeMutablePointer<R>.allocate(capacity: 1))
     }
 
-    guard let returnTypeFromTypeInfo: Any.Type = _getReturnTypeInfo(mangledMethodName: mangledTargetName) else {
+    guard let returnTypeFromTypeInfo: Any.Type = _getReturnTypeInfo(mangledMethodName: mangledTargetName,
+                                                                    genericEnv: genericEnv) else {
       throw ExecuteDistributedTargetError(
         message: "Failed to decode distributed target return type")
     }

stdlib/public/Distributed/DistributedMetadata.swift

@@ -41,14 +41,15 @@ func __getParameterCount(
 @available(SwiftStdlib 5.6, *)
 public // SPI _Distributed
 func _getParameterTypeInfo(
-    mangledMethodName name: String,
-    into typesBuffer: Builtin.RawPointer, length typesLength: Int
+  mangledMethodName name: String,
+  genericEnv: UnsafeRawPointer?, // GenericEnvironmentDescriptor *
+  into typesBuffer: Builtin.RawPointer, length typesLength: Int
 ) -> Int32 {
   let nameUTF8 = Array(name.utf8)
   return nameUTF8.withUnsafeBufferPointer { nameUTF8 in
     return __getParameterTypeInfo(
         nameUTF8.baseAddress!, UInt(nameUTF8.endIndex),
-        typesBuffer, typesLength)
+        genericEnv, typesBuffer, typesLength)
   }
 }
 
@@ -59,15 +60,20 @@ func _getParameterTypeInfo(
 public // SPI _Distributed
 func __getParameterTypeInfo(
     _ typeNameStart: UnsafePointer<UInt8>, _ typeNameLength: UInt,
+    _ genericEnv: UnsafeRawPointer?, // GenericEnvironmentDescriptor *
     _ types: Builtin.RawPointer, _ typesLength: Int
 ) -> Int32
 
 @available(SwiftStdlib 5.6, *)
 public // SPI _Distributed
-func _getReturnTypeInfo(mangledMethodName name: String) -> Any.Type? {
+func _getReturnTypeInfo(
+  mangledMethodName name: String,
+  genericEnv: UnsafeRawPointer? // GenericEnvironmentDescriptor *
+) -> Any.Type? {
   let nameUTF8 = Array(name.utf8)
   return nameUTF8.withUnsafeBufferPointer { nameUTF8 in
-    return __getReturnTypeInfo(nameUTF8.baseAddress!, UInt(nameUTF8.endIndex))
+    return __getReturnTypeInfo(nameUTF8.baseAddress!, UInt(nameUTF8.endIndex),
+                               genericEnv)
   }
 }
 
@@ -76,7 +82,8 @@ func _getReturnTypeInfo(mangledMethodName name: String) -> Any.Type? {
 public // SPI _Distributed
 func __getReturnTypeInfo(
     _ typeNameStart: UnsafePointer<UInt8>,
-    _ typeNameLength: UInt
+    _ typeNameLength: UInt,
+    _ genericEnv: UnsafeRawPointer? // GenericEnvironmentDescriptor *
 ) -> Any.Type?
 
 

stdlib/public/runtime/MetadataLookup.cpp

@@ -1984,7 +1984,8 @@ unsigned swift_func_getParameterCount(const char *typeNameStart,
 
 SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_SPI
 const Metadata *_Nullable
-swift_func_getReturnTypeInfo(const char *typeNameStart, size_t typeNameLength) {
+swift_func_getReturnTypeInfo(const char *typeNameStart, size_t typeNameLength,
+                             GenericEnvironmentDescriptor *genericEnv) {
   StackAllocatedDemangler<1024> demangler;
 
   auto *funcType =
@@ -2022,6 +2023,7 @@ SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_SPI
 unsigned
 swift_func_getParameterTypeInfo(
     const char *typeNameStart, size_t typeNameLength,
+    GenericEnvironmentDescriptor *genericEnv,
     Metadata const **types, unsigned typesLength) {
   if (typesLength < 0) return -1;
 

test/Distributed/Runtime/distributed_func_metadata.swift

@@ -118,10 +118,10 @@ typealias DefaultDistributedActorSystem = FakeActorSystem
   static func test_returnType() {
     print("~~ \(#function)")
     // CHECK: _getReturnTypeInfo: empty() = ()
-    print("_getReturnTypeInfo: empty() = \(String(reflecting: _getReturnTypeInfo(mangledMethodName: empty)!))")
+    print("_getReturnTypeInfo: empty() = \(String(reflecting: _getReturnTypeInfo(mangledMethodName: empty, genericEnv: nil)!))")
 
     // CHECK: _getReturnTypeInfo: one(s:) = Swift.Int
-    print("_getReturnTypeInfo: one(s:) = \(String(reflecting: _getReturnTypeInfo(mangledMethodName: one)!))")
+    print("_getReturnTypeInfo: one(s:) = \(String(reflecting: _getReturnTypeInfo(mangledMethodName: one, genericEnv: nil)!))")
   }
 
   static func test_paramTypes() {
@@ -178,6 +178,7 @@ func _withParameterTypeInfo(
     // 2) demangle and write all parameter types into the prepared buffer
     let decodedNum = __getParameterTypeInfo(
         nameUTF8.baseAddress!, UInt(nameUTF8.endIndex),
+        /*genericEnvironment=*/nil,
         infoBuffer.baseAddress!._rawValue, Int(paramCount))
 
     // if we failed demangling the types, return an empty array