Merge pull request #2507 from swiftwasm/main

[pull] swiftwasm from main

Author: pull[bot]

docs/ByteTree.md

@@ -86,9 +86,6 @@ documentation, please create a thread on the Swift forums under the
 
 ## Explanations
 
-- [ByteTree.md](/docs/ByteTree.md):
-  Describes the ByteTree binary format used for serializing syntax trees
-  in `libSyntax`.
 - [WebAssembly.md](/docs/WebAssembly.md):
   Explains some decisions that were made while implementing the WebAssembly target.
 

docs/README.md

@@ -19,13 +19,18 @@
 
 #include <inttypes.h>
 #include "swift/ABI/HeapObject.h"
+#include "swift/Runtime/Casting.h"
 
 namespace swift {
 class AsyncContext;
 class AsyncTask;
 class DefaultActor;
 class Job;
 
+/// FIXME: only exists for the quick-and-dirty MainActor implementation.
+SWIFT_EXPORT_FROM(swift_Concurrency)
+Metadata* MainActorMetadata;
+
 /// An ExecutorRef isn't necessarily just a pointer to an executor
 /// object; it may have other bits set.
 class ExecutorRef {
@@ -45,6 +50,13 @@ class ExecutorRef {
     return ExecutorRef(0);
   }
 
+  /// FIXME: only exists for the quick-and-dirty MainActor implementation.
+  /// NOTE: I didn't go with Executor::forMainActor(DefaultActor*) because
+  /// __swift_run_job_main_executor can't take more than one argument.
+  constexpr static ExecutorRef mainExecutor() {
+    return ExecutorRef(2);
+  }
+
   /// Given a pointer to a default actor, return an executor reference
   /// for it.
   static ExecutorRef forDefaultActor(DefaultActor *actor) {
@@ -57,6 +69,20 @@ class ExecutorRef {
     return Value == 0;
   }
 
+  /// FIXME: only exists for the quick-and-dirty MainActor implementation.
+  bool isMainExecutor() const {
+    if (Value == ExecutorRef::mainExecutor().Value)
+      return true;
+
+    HeapObject *heapObj = reinterpret_cast<HeapObject*>(Value & ~PointerMask);
+
+    if (heapObj == nullptr || MainActorMetadata == nullptr)
+      return false;
+
+    Metadata const* metadata = swift_getObjectType(heapObj);
+    return metadata == MainActorMetadata;
+  }
+
   /// Is this a default-actor executor reference?
   bool isDefaultActor() const {
     return Value & IsDefaultActor;
@@ -77,10 +103,12 @@ class ExecutorRef {
   }
 
   bool operator==(ExecutorRef other) const {
-    return Value == other.Value;
+    return Value == other.Value
+    /// FIXME: only exists for the quick-and-dirty MainActor implementation.
+          || (isMainExecutor() && other.isMainExecutor());
   }
   bool operator!=(ExecutorRef other) const {
-    return Value != other.Value;
+    return !(*this == other);
   }
 };