From 29da71761e0dd586c5f1cd27f277746400ddda43 Mon Sep 17 00:00:00 2001 From: Alastair Houghton Date: Fri, 21 Mar 2025 16:18:20 +0000 Subject: [PATCH] [Concurrency] Fix new build script. Looks like a new CMakelists.txt got added to the new build system while I was working on this. --- Runtimes/Core/Concurrency/CMakeLists.txt | 10 ++++++++++ Runtimes/Core/Concurrency/dispatch.cmake | 5 ++++- Runtimes/Core/Concurrency/hooked.cmake | 3 ++- Runtimes/Core/Concurrency/none.cmake | 3 ++- Runtimes/Core/Concurrency/singlethreaded.cmake | 3 ++- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Runtimes/Core/Concurrency/CMakeLists.txt b/Runtimes/Core/Concurrency/CMakeLists.txt index 6ee065572bf25..8dd89783d7ac2 100644 --- a/Runtimes/Core/Concurrency/CMakeLists.txt +++ b/Runtimes/Core/Concurrency/CMakeLists.txt @@ -11,6 +11,7 @@ add_library(swift_Concurrency ConcurrencyHooks.cpp EmbeddedSupport.cpp Error.cpp + ExecutorBridge.cpp ExecutorChecks.cpp GlobalExecutor.cpp Setup.cpp @@ -47,6 +48,7 @@ add_library(swift_Concurrency CheckedContinuation.swift Clock.swift ContinuousClock.swift + CooperativeExecutor.swift Deque/_DequeBuffer.swift Deque/_DequeBufferHeader.swift Deque/_DequeSlot.swift @@ -67,19 +69,27 @@ add_library(swift_Concurrency Deque/Deque+UnsafeHandle.swift Deque/UnsafeMutableBufferPointer+Utilities.swift DiscardingTaskGroup.swift + DummyExecutor.swift Errors.swift Executor.swift ExecutorAssertions.swift + ExecutorBridge.swift GlobalActor.swift GlobalConcurrentExecutor.swift MainActor.swift PartialAsyncTask.swift + PlatformExecutorDarwin.swift + PlatformExecutorLinux.swift + PlatformExecutorWindows.swift + PriorityQueue.swift SourceCompatibilityShims.swift SuspendingClock.swift Task.swift + Task+PriorityEscalation.swift Task+TaskExecutor.swift TaskCancellation.swift TaskGroup.swift + TaskGroup+Embedded.swift TaskLocal.swift TaskSleep.swift TaskSleepDuration.swift diff --git a/Runtimes/Core/Concurrency/dispatch.cmake b/Runtimes/Core/Concurrency/dispatch.cmake index d0f1adc700999..4d04b582a3b4c 100644 --- a/Runtimes/Core/Concurrency/dispatch.cmake +++ b/Runtimes/Core/Concurrency/dispatch.cmake @@ -2,7 +2,10 @@ find_package(dispatch QUIET REQUIRED) target_sources(swift_Concurrency PRIVATE - DispatchGlobalExecutor.cpp) + DispatchGlobalExecutor.cpp + DispatchExecutor.swift + CFExecutor.swift + ExecutorImpl.swift) target_compile_definitions(swift_Concurrency PRIVATE $<$:-DSWIFT_CONCURRENCY_USES_DISPATCH=1>) target_compile_options(swift_Concurrency PRIVATE diff --git a/Runtimes/Core/Concurrency/hooked.cmake b/Runtimes/Core/Concurrency/hooked.cmake index 009723d792bd6..2a420147f6bbc 100644 --- a/Runtimes/Core/Concurrency/hooked.cmake +++ b/Runtimes/Core/Concurrency/hooked.cmake @@ -1,2 +1,3 @@ target_sources(swift_Concurrency PRIVATE - NonDispatchGlobalExecutor.cpp) + ExecutorImpl.swift + PlatformExecutorNone.swift) diff --git a/Runtimes/Core/Concurrency/none.cmake b/Runtimes/Core/Concurrency/none.cmake index 009723d792bd6..2a420147f6bbc 100644 --- a/Runtimes/Core/Concurrency/none.cmake +++ b/Runtimes/Core/Concurrency/none.cmake @@ -1,2 +1,3 @@ target_sources(swift_Concurrency PRIVATE - NonDispatchGlobalExecutor.cpp) + ExecutorImpl.swift + PlatformExecutorNone.swift) diff --git a/Runtimes/Core/Concurrency/singlethreaded.cmake b/Runtimes/Core/Concurrency/singlethreaded.cmake index 0c4f1109cefee..052ae5348783a 100644 --- a/Runtimes/Core/Concurrency/singlethreaded.cmake +++ b/Runtimes/Core/Concurrency/singlethreaded.cmake @@ -1,2 +1,3 @@ target_sources(swift_Concurrency PRIVATE - CooperativeGlobalExecutor.cpp) + ExecutorImpl.swift + PlatformExecutorCooperative.swift)