[Concurrency] Teach Type::stripConcurrency to handle tuples

Author: xedin

lib/AST/Type.cpp

@@ -1128,6 +1128,23 @@ Type TypeBase::stripConcurrency(bool recurse, bool dropGlobalActor) {
                       : Type(this);
   }
 
+  if (auto *tuple = getAs<TupleType>()) {
+    if (!recurse)
+      return Type(this);
+
+    bool anyChanged = false;
+    SmallVector<TupleTypeElt, 2> elts;
+    llvm::transform(
+        tuple->getElements(), std::back_inserter(elts), [&](const auto &elt) {
+          auto eltTy = elt.getType();
+          auto strippedTy = eltTy->stripConcurrency(recurse, dropGlobalActor);
+          anyChanged |= !strippedTy->isEqual(eltTy);
+          return elt.getWithType(strippedTy);
+        });
+
+    return anyChanged ? TupleType::get(elts, getASTContext()) : Type(this);
+  }
+
   return Type(this);
 }
 

test/Concurrency/sendable_preconcurrency_erasure.swift

@@ -11,4 +11,11 @@ do {
   // CHECK-LABEL: sil private [ossa] @$s31sendable_preconcurrency_erasure4testL_yyAA1SL_VyypGF
   @preconcurrency func test(_: S<Array<@Sendable () -> Void>>) {}
   // CHECK-LABEL: sil private [ossa] @$s31sendable_preconcurrency_erasure4testL0_yyAA1SL_VySayyycGGF
+  @preconcurrency func test(_: Array<(any Sendable, @Sendable () -> Void)>) {}
+  // CHECK-LABEL: sil private [ossa] @$s31sendable_preconcurrency_erasure4testL1_yySayyp_yyctGF
+}
+
+public struct Data {
+  @preconcurrency var test: (any Sendable, Array<(Int, any Sendable)>)? = nil
+  // CHECK-LABEL: sil [transparent] [ossa] @$s31sendable_preconcurrency_erasure4DataV4testyp_SaySi_yptGtSgvpfi
 }