reworked includes to stop hitting undefined symbols

Author: ktoso

include/swift/ABI/Task.h

@@ -17,10 +17,9 @@
 #ifndef SWIFT_ABI_TASK_H
 #define SWIFT_ABI_TASK_H
 
-#include "swift/Basic/RelativePointer.h"
+#include "swift/ABI/TaskGroup.h"
 #include "swift/ABI/Executor.h"
 #include "swift/ABI/HeapObject.h"
-#include "swift/ABI/TaskGroup.h"
 #include "swift/ABI/Metadata.h"
 #include "swift/ABI/MetadataValues.h"
 #include "swift/Runtime/Config.h"
@@ -158,7 +157,6 @@ class ActiveTaskStatus {
 /// * The future fragment is dynamic in size, based on the future result type
 ///   it can hold, and thus must be the *last* fragment.
 class AsyncTask : public HeapObject, public Job {
-  friend TaskGroup;
 public:
   /// The context for resuming the job.  When a task is scheduled
   /// as a job, the next continuation should be installed as the

include/swift/ABI/TaskGroup.h

@@ -17,22 +17,21 @@
 #ifndef SWIFT_ABI_TASK_GROUP_H
 #define SWIFT_ABI_TASK_GROUP_H
 
+#include "swift/Runtime/Concurrency.h"
+#include "swift/ABI/Task.h"
 #include "swift/Basic/RelativePointer.h"
-#include "swift/ABI/Executor.h"
 #include "swift/ABI/HeapObject.h"
-#include "swift/ABI/Metadata.h"
-#include "swift/ABI/TaskStatus.h"
-#include "swift/ABI/MetadataValues.h"
 #include "swift/Runtime/Config.h"
 #include "swift/Basic/STLExtras.h"
-#include "Task.h"
 #include "bitset"
 #include "string"
 #include "queue" // TODO: remove and replace with usage of our mpsc queue
 #include <atomic>
 #include <assert.h>
 
 namespace swift {
+class TaskGroupTaskStatusRecord;
+class AsyncTask;
 
   // ==== TaskGroup ------------------------------------------------------------
 

include/swift/Runtime/Concurrency.h

@@ -17,8 +17,8 @@
 #ifndef SWIFT_RUNTIME_CONCURRENCY_H
 #define SWIFT_RUNTIME_CONCURRENCY_H
 
-#include "swift/ABI/TaskStatus.h"
 #include "swift/ABI/TaskGroup.h"
+#include "swift/ABI/TaskStatus.h"
 
 namespace swift {
 class DefaultActor;

stdlib/public/Concurrency/Actor.cpp

@@ -21,6 +21,7 @@
 #include "swift/Runtime/Casting.h"
 #include "swift/Runtime/Mutex.h"
 #include "swift/Runtime/ThreadLocal.h"
+#include "swift/ABI/Task.h"
 #include "swift/ABI/Actor.h"
 #include "llvm/ADT/PointerIntPair.h"
 #include "TaskPrivate.h"

stdlib/public/Concurrency/TaskAlloc.cpp

@@ -17,8 +17,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "TaskPrivate.h"
 #include "swift/Runtime/Concurrency.h"
+#include "swift/ABI/Task.h"
+#include "TaskPrivate.h"
 #include "../runtime/StackAllocator.h"
 #include <stdlib.h>
 

stdlib/public/Concurrency/TaskGroup.cpp

@@ -21,7 +21,6 @@
 #include "swift/Runtime/Mutex.h"
 #include "swift/Runtime/HeapObject.h"
 #include "TaskPrivate.h"
-#include "TaskPrivate.h"
 #include "AsyncCall.h"
 #include "Debug.h"
 
@@ -32,7 +31,6 @@
 #endif
 
 using namespace swift;
-using TaskGroup = swift::TaskGroup;
 using FutureFragment = AsyncTask::FutureFragment;
 
 using ReadyQueueItem = TaskGroup::ReadyQueueItem;
@@ -394,3 +392,4 @@ bool TaskGroup::cancelAll(AsyncTask *task) {
 bool swift::swift_task_group_add_pending(TaskGroup *group) {
   return !group->statusAddPendingTaskRelaxed().isCancelled();
 }
+

stdlib/public/Concurrency/TaskPrivate.h

@@ -19,7 +19,6 @@
 
 #include "swift/Runtime/Concurrency.h"
 #include "swift/ABI/Task.h"
-#include "swift/ABI/TaskGroup.h"
 #include "swift/ABI/Metadata.h"
 #include "swift/Runtime/HeapObject.h"
 #include "swift/Runtime/Error.h"