[CMAKE] Fix layering issue between Concurrency and Darwin overlay #82973
Conversation
justice-adams-apple
requested review from
ktoso,
etcwilde,
compnerd and
edymtt
as code owners
|
@swift-ci please smoke test |
| @@ -14,15 +14,19 @@ | |||
|
|
|||
| import Swift | |||
|
|
|||
| internal import Darwin | |||
| @_silgen_name("swift_concurrency_dlopen_noload") | |||
| private func dlopen(_ path: String) -> OpaquePointer? | |||
There was a problem hiding this comment.
Since this symbol is mapping in the RTLD_NOLOAD, we should likely not name this dlopen to avoid confusion.
Also, swift_concurrency_dlopen_noload is taking a const char *, not a Swift string. We're not using the automatic bridging here so I don't think you get the automatic conversion thunks. I believe this type should be an UnsafePointer<CChar>?.
There was a problem hiding this comment.
renamed it to dlopen_noload
| @@ -15,7 +15,6 @@ import Swift | |||
| #if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY | |||
| #if ASYNC_STREAM_STANDALONE | |||
| @_exported import _Concurrency | |||
| import Darwin | |||
There was a problem hiding this comment.
What API is this import Darwin pulling in?
There was a problem hiding this comment.
it's pulling in the Darwin.os functionality it looks like, you're right I was too zealous in removing this. I'm going to restore this and handle it in a separate PR
|
@swift-ci please smoke test |
| #if !defined(_WIN32) && !defined(__wasi__) && __has_include(<dlfcn.h>) | ||
| #include <dlfcn.h> | ||
| #endif |
There was a problem hiding this comment.
| #if !defined(_WIN32) && !defined(__wasi__) && __has_include(<dlfcn.h>) | |
| #include <dlfcn.h> | |
| #endif | |
| #include <dlfcn.h> |
This seems like we shouldn't bother with the guards as this is now Darwin specific.
|
@swift-ci please smoke test |
Concurrency from the Core project is importing the Darwin platform overlay, which in turn depends on SwiftCore from the Core project, breaking the project layering.
Concurrency only needs the Clang module, but Swift does not have a mechanism to only import a clang module. For now import the functionality needed from Darwin by importing and wrapping the associated functions from
<dlfcn.h>withinCFExecutor.cppAlso remove Darwin import from
AsyncStreamBuffer.swiftbecause it is not used