Merge pull request #80690 from swiftlang/revert-80601-maxd/fix-executor-impl

Revert "Concurrency: Move code between `Executor{Bridge,Impl}.cpp`"

Author: artemcm

stdlib/public/Concurrency/CMakeLists.txt

@@ -166,13 +166,8 @@ set(SWIFT_RUNTIME_CONCURRENCY_SWIFT_SOURCES
   PlatformExecutorWindows.swift
 )
 
-set(SWIFT_RUNTIME_CONCURRENCY_NONEMBEDDED_C_SOURCES
-  ExecutorImpl.cpp
-)
-
 set(SWIFT_RUNTIME_CONCURRENCY_EXECUTOR_SOURCES)
 set(SWIFT_RUNTIME_CONCURRENCY_NONEMBEDDED_SWIFT_SOURCES)
-
 if("${SWIFT_CONCURRENCY_GLOBAL_EXECUTOR}" STREQUAL "dispatch")
   set(SWIFT_RUNTIME_CONCURRENCY_EXECUTOR_SOURCES
     DispatchGlobalExecutor.cpp
@@ -207,7 +202,6 @@ set(LLVM_OPTIONAL_SOURCES
 add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   ${SWIFT_RUNTIME_CONCURRENCY_C_SOURCES}
   ${SWIFT_RUNTIME_CONCURRENCY_EXECUTOR_SOURCES}
-  ${SWIFT_RUNTIME_CONCURRENCY_NONEMBEDDED_C_SOURCES}
   ${SWIFT_RUNTIME_CONCURRENCY_SWIFT_SOURCES}
   ${SWIFT_RUNTIME_CONCURRENCY_NONEMBEDDED_SWIFT_SOURCES}
 

stdlib/public/Concurrency/ExecutorBridge.cpp

@@ -34,11 +34,83 @@ SerialExecutorRef swift_getMainExecutor() {
 }
 #endif
 
+extern "C" SWIFT_CC(swift)
+void _swift_task_checkIsolatedSwift(
+  HeapObject *executor,
+  const Metadata *executorType,
+  const SerialExecutorWitnessTable *witnessTable
+);
+
 extern "C" SWIFT_CC(swift)
 void _swift_task_checkIsolatedSwift(HeapObject *executor,
                                     const Metadata *executorType,
                                     const SerialExecutorWitnessTable *witnessTable);
 
+extern "C" SWIFT_CC(swift)
+bool _swift_task_isIsolatingCurrentContextSwift(
+  HeapObject *executor,
+  const Metadata *executorType,
+  const SerialExecutorWitnessTable *witnessTable
+);
+
+extern "C" SWIFT_CC(swift)
+bool _swift_task_isMainExecutorSwift(
+  HeapObject *executor,
+  const Metadata *executorType,
+  const SerialExecutorWitnessTable *witnessTable
+);
+
+extern "C" SWIFT_CC(swift)
+void swift_task_checkIsolatedImpl(SerialExecutorRef executor) {
+  HeapObject *identity = executor.getIdentity();
+
+  // We might be being called with an actor rather than a "proper"
+  // SerialExecutor; in that case, we won't have a SerialExecutor witness
+  // table.
+  if (executor.hasSerialExecutorWitnessTable()) {
+    _swift_task_checkIsolatedSwift(identity,
+                                   swift_getObjectType(identity),
+                                   executor.getSerialExecutorWitnessTable());
+  } else {
+    const Metadata *objectType = swift_getObjectType(executor.getIdentity());
+    auto typeName = swift_getTypeName(objectType, true);
+
+    swift_Concurrency_fatalError(
+      0, "Incorrect actor executor assumption; expected '%.*s' executor.\n",
+      (int)typeName.length, typeName.data);
+  }
+}
+
+extern "C" SWIFT_CC(swift)
+bool swift_task_isIsolatingCurrentContextImpl(SerialExecutorRef executor) {
+  HeapObject *identity = executor.getIdentity();
+
+  // We might be being called with an actor rather than a "proper"
+  // SerialExecutor; in that case, we won't have a SerialExecutor witness
+  // table.
+  if (executor.hasSerialExecutorWitnessTable()) {
+    return _swift_task_isIsolatingCurrentContextSwift(identity,
+                                   swift_getObjectType(identity),
+                                   executor.getSerialExecutorWitnessTable());
+  } else {
+    const Metadata *objectType = swift_getObjectType(executor.getIdentity());
+    auto typeName = swift_getTypeName(objectType, true);
+
+    swift_Concurrency_fatalError(
+      0, "Incorrect actor executor assumption; expected '%.*s' executor.\n",
+      (int)typeName.length, typeName.data);
+  }
+}
+
+extern "C" SWIFT_CC(swift)
+bool swift_task_isMainExecutorImpl(SerialExecutorRef executor) {
+  HeapObject *identity = executor.getIdentity();
+  return executor.hasSerialExecutorWitnessTable()
+    && _swift_task_isMainExecutorSwift(identity,
+                                       swift_getObjectType(identity),
+                                       executor.getSerialExecutorWitnessTable());
+}
+
 extern "C" SWIFT_CC(swift)
 uint8_t swift_job_getPriority(Job *job) {
   return (uint8_t)(job->getPriority());