Merge pull request #39756 from DougGregor/back-deployed-concurrency-disable-exclusivity

Author: DougGregor

stdlib/public/BackDeployConcurrency/Exclusivity.cpp

@@ -14,36 +14,16 @@
 //
 //===----------------------------------------------------------------------===//
 #include <cinttypes>
-
-#include "swift/Basic/Lazy.h"
 #include "swift/Runtime/Exclusivity.h"
-#include "swift/Runtime/ThreadLocalStorage.h"
-#include "../runtime/ExclusivityPrivate.h"
-#include "../runtime/SwiftTLSContext.h"
 
 using namespace swift;
-using namespace swift::runtime;
 
-SwiftTLSContext &SwiftTLSContext::get() {
-  SwiftTLSContext *ctx = static_cast<SwiftTLSContext *>(
-      SWIFT_THREAD_GETSPECIFIC(SWIFT_RUNTIME_TLS_KEY));
-  if (ctx)
-    return *ctx;
+void swift::swift_task_enterThreadLocalContextBackDeploy(char *state) { }
 
-  static OnceToken_t setupToken;
-  SWIFT_ONCE_F(
-      setupToken,
-      [](void *) {
-        pthread_key_init_np(SWIFT_RUNTIME_TLS_KEY, [](void *pointer) {
-          delete static_cast<SwiftTLSContext *>(pointer);
-        });
-      },
-      nullptr);
+void swift::swift_task_exitThreadLocalContextBackDeploy(char *state) { }
 
-  ctx = new SwiftTLSContext();
-  SWIFT_THREAD_SETSPECIFIC(SWIFT_RUNTIME_TLS_KEY, ctx);
-  return *ctx;
+// Forcibly disable exclusivity checking, because the back-deployed concurrency
+// library cannot communicate with older Swift runtimes effectively.
+__attribute__((constructor)) static void disableExclusivityChecking() {
+  _swift_disableExclusivityChecking = true;
 }
-
-// Bring in the concurrency-specific exclusivity code.
-#include "../runtime/ConcurrencyExclusivity.inc"

test/Concurrency/Runtime/exclusivity.swift

@@ -6,6 +6,7 @@
 // REQUIRES: concurrency_runtime
 // UNSUPPORTED: back_deployment_runtime
 // UNSUPPORTED: OS=wasi
+// UNSUPPORTED: use_os_stdlib
 
 // This test makes sure that:
 //

test/Concurrency/Runtime/exclusivity_custom_executors.swift

@@ -13,6 +13,8 @@
 // Disabled until test hang can be looked at.
 // UNSUPPORTED: OS=windows-msvc
 
+// UNSUPPORTED: use_os_stdlib
+
 // This test makes sure that we properly save/restore access when we
 // synchronously launch a task from a serial executor. The access from the task
 // should be merged into the already created access set while it runs and then

test/Interpreter/enforce_exclusive_access.swift

@@ -6,6 +6,8 @@
 // REQUIRES: executable_test
 // UNSUPPORTED: single_threaded_runtime
 
+// UNSUPPORTED: use_os_stdlib
+
 // Tests for traps at run time when enforcing exclusive access.
 
 import StdlibUnittest