[sending] Fix type reconstruction of sending parameters.

Author: gottesmm

include/swift/Demangling/TypeDecoder.h

@@ -183,6 +183,14 @@ class ImplFunctionParam {
     return {};
   }
 
+  static OptionsType getSending() {
+    OptionsType result;
+
+    result |= ImplParameterInfoFlags::Sending;
+
+    return result;
+  }
+
   ImplFunctionParam(BuiltType type, ImplParameterConvention convention,
                     OptionsType options)
       : Type(type), Convention(convention), Options(options) {}
@@ -256,6 +264,12 @@ class ImplFunctionResult {
     return {};
   }
 
+  static OptionsType getSending() {
+    OptionsType result;
+    result |= ImplResultInfoFlags::IsSending;
+    return result;
+  }
+
   ImplFunctionResult(BuiltType type, ImplResultConvention convention,
                      ImplResultInfoOptions options = {})
       : Type(type), Convention(convention), Options(options) {}
@@ -1594,8 +1608,9 @@ class TypeDecoder {
     if (depth > TypeDecoder::MaxDepth)
       return true;
 
-    // Children: `convention, differentiability?, type`
-    if (node->getNumChildren() != 2 && node->getNumChildren() != 3)
+    // Children: `convention, differentiability?, sending?, type`
+    if (node->getNumChildren() != 2 && node->getNumChildren() != 3 &&
+        node->getNumChildren() != 4)
       return true;
 
     auto *conventionNode = node->getChild(0);
@@ -1613,7 +1628,7 @@ class TypeDecoder {
       return true;
 
     typename T::OptionsType options;
-    if (node->getNumChildren() == 3) {
+    if (node->getNumChildren() == 3 || node->getNumChildren() == 4) {
       auto diffKindNode = node->getChild(1);
       if (diffKindNode->getKind() !=
           Node::Kind::ImplParameterResultDifferentiability)
@@ -1625,6 +1640,13 @@ class TypeDecoder {
       options |= *optDiffOptions;
     }
 
+    if (node->getNumChildren() == 4) {
+      auto sendingKindNode = node->getChild(2);
+      if (sendingKindNode->getKind() != Node::Kind::ImplParameterSending)
+        return true;
+      options |= T::getSending();
+    }
+
     results.emplace_back(result.getType(), *convention, options);
 
     return false;

test/DebugInfo/sending_params_and_results.swift

@@ -0,0 +1,30 @@
+// RUN: %target-swift-frontend -emit-ir -g -o - -module-name test -strict-concurrency=complete -swift-version 5 -enable-upcoming-feature SendingArgsAndResults -disable-availability-checking %s | %FileCheck %s
+
+// Test that we can properly reconstruct sending from various tests when
+// emitting debug info. Only place examples in here that have already failed.
+
+public struct SendableStruct: Sendable {
+}
+
+// This verifies that we can properly type reconstruct:
+//
+//   $ss6ResultOy4test14SendableStructVs5Error_pGIeggT_D
+//
+// Which is:
+//
+//   @escaping @callee_guaranteed (@guaranteed sending Swift.Result<test.SendableStruct, Swift.Error>) -> ()
+//
+// CHECK: !{{[0-9]+}} = !DICompositeType(tag: DW_TAG_structure_type, name: "$ss6ResultOy4test14SendableStructVs5Error_pGIeggT_D", flags: DIFlagFwdDecl, runtimeLang: DW_LANG_Swift)
+func testReconstructingEscapingClosureWithSendingParam() async throws -> SendableStruct {
+  func callSendableFunction(_ x: @Sendable () -> ()) {}
+
+  func helper(_ completion: @escaping (Result<SendableStruct, Swift.Error>) -> Void) {
+    fatalError()
+  }
+
+  return try await withCheckedThrowingContinuation { continuation in
+    callSendableFunction {
+      helper(continuation.resume(with:))
+    }
+  }
+}