Merge pull request #80761 from al45tair/eng/PR-149067144

[Concurrency] Fix size of AsyncTask::PrivateStorage.

Author: al45tair

include/swift/ABI/Task.h

@@ -316,9 +316,10 @@ class AsyncTask : public Job {
 #endif
 
     // Private storage is currently 6 pointers, 16 bytes of non-pointer data,
-    // the ActiveTaskStatus, and a RecursiveMutex.
+    // 8 bytes of padding, the ActiveTaskStatus, and a RecursiveMutex.
     static constexpr size_t PrivateStorageSize =
-        6 * sizeof(void *) + 16 + ActiveTaskStatusSize + sizeof(RecursiveMutex);
+      6 * sizeof(void *) + 16 + 8 + ActiveTaskStatusSize
+      + sizeof(RecursiveMutex);
 
     char Storage[PrivateStorageSize];
 

stdlib/public/Concurrency/TaskPrivate.h

@@ -766,16 +766,20 @@ struct AsyncTask::PrivateStorage {
   alignas(ActiveTaskStatus) char StatusStorage[sizeof(ActiveTaskStatus)];
 
   /// The allocator for the task stack.
-  /// Currently 2 words + 8 bytes.
+  /// Currently 2 words + 4 bytes.
   TaskAllocator Allocator;
 
+  // Four bytes of padding here (on 64-bit)
+
   /// Storage for task-local values.
   /// Currently one word.
   TaskLocal::Storage Local;
 
   /// The top 32 bits of the task ID. The bottom 32 bits are in Job::Id.
   uint32_t Id;
 
+  // Another four bytes of padding here too (on 64-bit)
+
   /// Base priority of Task - set only at creation time of task.
   /// Current max priority of task is ActiveTaskStatus.
   ///