Fixes for the 5.5 branch

Author: DougGregor

lib/AST/Builtins.cpp

@@ -1427,7 +1427,7 @@ Type swift::getAsyncTaskAndContextType(ASTContext &ctx) {
 static ValueDecl *getCreateAsyncTask(ASTContext &ctx, Identifier id) {
   BuiltinFunctionBuilder builder(ctx);
   auto genericParam = makeGenericParam().build(builder);
-  builder.addParameter(makeConcrete(ctx.getIntType())); // 0 flags
+  builder.addParameter(makeConcrete(ctx.getIntDecl()->getDeclaredInterfaceType())); // 0 flags
   auto extInfo = ASTExtInfoBuilder().withAsync().withThrows().build();
   builder.addParameter(
       makeConcrete(FunctionType::get({ }, genericParam, extInfo))); // 1 operation
@@ -1438,7 +1438,7 @@ static ValueDecl *getCreateAsyncTask(ASTContext &ctx, Identifier id) {
 static ValueDecl *getCreateAsyncTaskInGroup(ASTContext &ctx, Identifier id) {
   BuiltinFunctionBuilder builder(ctx);
   auto genericParam = makeGenericParam().build(builder); // <T>
-  builder.addParameter(makeConcrete(ctx.getIntType())); // 0 flags
+  builder.addParameter(makeConcrete(ctx.getIntDecl()->getDeclaredInterfaceType())); // 0 flags
   builder.addParameter(makeConcrete(ctx.TheRawPointerType)); // 1 group
   auto extInfo = ASTExtInfoBuilder().withAsync().withThrows().build();
   builder.addParameter(

stdlib/public/Concurrency/Task.swift

@@ -859,29 +859,6 @@ public func _taskFutureGet<T>(_ task: Builtin.NativeObject) async -> T
 @_silgen_name("swift_task_future_wait_throwing")
 public func _taskFutureGetThrowing<T>(_ task: Builtin.NativeObject) async throws -> T
 
-@available(SwiftStdlib 5.5, *)
-public func _runChildTask<T>(
-  operation: @Sendable @escaping () async throws -> T
-) async -> Builtin.NativeObject {
-  let currentTask = Builtin.getCurrentAsyncTask()
-
-  // Set up the job flags for a new task.
-  var flags = JobFlags()
-  flags.kind = .task
-  flags.priority = getJobFlags(currentTask).priority ?? .unspecified
-  flags.isFuture = true
-  flags.isChildTask = true
-
-  // Create the asynchronous task future.
-  let (task, _) = Builtin.createAsyncTaskFuture(
-      Int(flags.bits), operation)
-
-  // Enqueue the resulting job.
-  _enqueueJobGlobal(Builtin.convertTaskToJob(task))
-
-  return task
-}
-
 @available(SwiftStdlib 5.5, *)
 @_silgen_name("swift_task_cancel")
 func _taskCancel(_ task: Builtin.NativeObject)

test/SILOptimizer/closure_lifetime_fixup.swift

@@ -67,7 +67,7 @@ public func testGeneric(c: C) {
 // CHECK:   [[PA:%.*]] = partial_apply [callee_guaranteed] [on_stack]
 // CHECK:   [[MD:%.*]] = mark_dependence [[PA]]
 // CHECK:   [[CONV:%.*]] = convert_function [[MD]]
-// CHECK:   [[BAL:%.*]] = builtin "startAsyncLet"<String>([[CONV]]
+// CHECK:   [[BAL:%.*]] = builtin "startAsyncLet"<String>({{.*}}, [[CONV]]
 // CHECK:   builtin "endAsyncLet"([[BAL]] : $Builtin.RawPointer, [[MD]]
 // CHECK: } // end sil function '$s22closure_lifetime_fixup12testAsyncLetyS2SYaF'