Merge pull request #36490 from aschwaighofer/remove_unused_resume_parent_executor

Remove unused resume parent executor

Author: aschwaighofer

include/swift/ABI/Task.h

@@ -483,10 +483,6 @@ class alignas(MaximumAlignment) AsyncContext {
   TaskContinuationFunction * __ptrauth_swift_async_context_resume
     ResumeParent;
 
-  /// The executor that the parent needs to be resumed on.
-  /// FIXME: remove this
-  ExecutorRef ResumeParentExecutor;
-
   /// Flags describing this context.
   ///
   /// Note that this field is only 32 bits; any alignment padding
@@ -499,7 +495,6 @@ class alignas(MaximumAlignment) AsyncContext {
                TaskContinuationFunction *resumeParent,
                AsyncContext *parent)
     : Parent(parent), ResumeParent(resumeParent),
-      ResumeParentExecutor(ExecutorRef::generic()),
       Flags(flags) {}
 
   AsyncContext(const AsyncContext &) = delete;

lib/IRGen/GenCall.cpp

@@ -114,13 +114,6 @@ irgen::getAsyncContextLayout(IRGenModule &IGM, CanSILFunctionType originalType,
     valTypes.push_back(ty);
     typeInfos.push_back(&ti);
   };
-  auto addExecutor = [&]() {
-    auto ty = SILType();
-    auto &ti = IGM.getSwiftExecutorPtrTypeInfo();
-    valTypes.push_back(ty);
-    typeInfos.push_back(&ti);
-  };
-
   // AsyncContext * __ptrauth_swift_async_context_parent Parent;
   {
     auto ty = SILType();
@@ -133,9 +126,6 @@ irgen::getAsyncContextLayout(IRGenModule &IGM, CanSILFunctionType originalType,
   //     ResumeParent;
   addTaskContinuationFunction();
 
-  // ExecutorRef ResumeParentExecutor;
-  addExecutor();
-
   // AsyncContextFlags Flags;
   {
     auto ty = SILType::getPrimitiveObjectType(

lib/IRGen/GenCall.h

@@ -83,13 +83,11 @@ namespace irgen {
     enum class FixedIndex : unsigned {
       Parent = 0,
       ResumeParent = 1,
-      ResumeParentExecutor = 2,
-      Flags = 3,
+      Flags = 2,
     };
     enum class FixedCount : unsigned {
       Parent = 1,
       ResumeParent = 1,
-      ResumeParentExecutor = 1,
     };
     CanSILFunctionType originalType;
     CanSILFunctionType substitutedType;
@@ -99,22 +97,13 @@ namespace irgen {
     unsigned getResumeParentIndex() {
       return (unsigned)FixedIndex::ResumeParent;
     }
-    unsigned getResumeParentExecutorIndex() {
-      return (unsigned)FixedIndex::ResumeParentExecutor;
-    }
     unsigned getFlagsIndex() { return (unsigned)FixedIndex::Flags; }
-    unsigned getErrorIndex() {
-      return getFlagsIndex() + 1;
-    }
 
   public:
     ElementLayout getParentLayout() { return getElement(getParentIndex()); }
     ElementLayout getResumeParentLayout() {
       return getElement(getResumeParentIndex());
     }
-    ElementLayout getResumeParentExecutorLayout() {
-      return getElement(getResumeParentExecutorIndex());
-    }
     ElementLayout getFlagsLayout() { return getElement(getFlagsIndex()); }
 
     AsyncContextLayout(

stdlib/public/Concurrency/Task.cpp

@@ -427,7 +427,6 @@ static AsyncTaskAndContext swift_task_create_group_future_impl(
   initialContext->Parent = nullptr;
   initialContext->ResumeParent = reinterpret_cast<TaskContinuationFunction *>(
       closureContext ? &completeTaskWithClosure : &completeTask);
-  initialContext->ResumeParentExecutor = ExecutorRef::generic();
   initialContext->Flags = AsyncContextKind::Ordinary;
   initialContext->Flags.setShouldNotDeallocateInCallee(true);
 

test/IRGen/async.swift

@@ -17,7 +17,7 @@ public class SomeClass {}
 public func task_future_wait(_ task: __owned SomeClass) async throws -> Int
 
 // CHECK: define{{.*}} swift{{(tail)?}}cc void @"$s5async8testThisyyAA9SomeClassCnYF"(%swift.context* swiftasync %0{{.*}}
-// CHECK-64: call swiftcc i8* @swift_task_alloc(i64 56)
+// CHECK-64: call swiftcc i8* @swift_task_alloc(i64 48)
 // CHECK: {{(must)?}}tail call swift{{(tail)?}}cc void @swift_task_future_wait(
 public func testThis(_ task: __owned SomeClass) async {
   do {