Skip to content

StdlibUnittest: import _Concurrency explicitly #3469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 4, 2021
Merged

StdlibUnittest: import _Concurrency explicitly #3469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9a19ae
StdlibUnittest: import _Concurrency explicitly
kateinoigakukun Sep 4, 2021
c1e4083
Revert "Workaround for broken implicit import auto static linking"
kateinoigakukun Sep 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions stdlib/private/StdlibUnittest/StdlibUnittest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ import WinSDK
import ObjectiveC
#endif

#if SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY
import _Concurrency
#endif

#if os(WASI)
let platformSupportSpawnChild = false
#else
Expand Down
7 changes: 0 additions & 7 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,13 +1581,6 @@ elif run_os == 'wasi':
'-target', config.variant_triple,
'-Xcc', '--sysroot=%s' % config.variant_sdk,
'-Xclang-linker', '--sysroot=%s' % config.variant_sdk,
# workaroud: Even though StdlibUnittest uses _Concurrency,
# _Concurrency module won't be listed in IMPORTED_MODULE.
# And -parse-stdlib disables implicit imports, so autolink
# system is broken when static link & -parse-stdlib & importing _Concurrency.
# This issue causes link failure that reports there are missing swift_task_XX
# symbols.
'-lswift_Concurrency',
'-toolchain-stdlib-rpath', config.resource_dir_opt,
mcp_opt, config.swift_test_options,
config.swift_driver_test_options, swift_execution_tests_extra_flags])
Expand Down