Skip to content

Commit de3a87c

Browse files
nickolas-pohiletsnickolas-pohilets
committed
Merge branch 'main' into mpokhylets/weak-let
2 parents 3de9109 + a478db9 commit de3a87c

File tree

485 files changed

+9071
-3796
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

485 files changed

+9071
-3796
lines changed

‎.github/CODEOWNERS

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@
8282
/include/swift/AST/DiagnosticsClangImporter.def @zoecarver @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @fahadnayyar @susmonteiro
8383
/include/swift/AST/DiagnosticsDriver.def @artemcm
8484
/include/swift/AST/DiagnosticsFrontend.def @artemcm @tshortli
85-
/include/swift/AST/DiagnosticsIDE.def @ahoppen @bnbarham @hamishknight @rintaro
85+
/include/swift/AST/DiagnosticsIDE.def @bnbarham @hamishknight @rintaro
8686
/include/swift/AST/DiagnosticsIRGen.def @rjmccall
8787
/include/swift/AST/DiagnosticsModuleDiffer.def @nkcsgexi
88-
/include/swift/AST/DiagnosticsParse.def @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
89-
/include/swift/AST/DiagnosticsRefactoring.def @ahoppen @bnbarham @hamishknight @rintaro
88+
/include/swift/AST/DiagnosticsParse.def @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
89+
/include/swift/AST/DiagnosticsRefactoring.def @bnbarham @hamishknight @rintaro
9090
/include/swift/AST/DiagnosticsSIL.def @jckarter
9191
/include/swift/AST/Evaluator* @CodaFi @slavapestov
9292
/include/swift/Basic/ @DougGregor
@@ -95,21 +95,21 @@
9595
/include/swift/DependencyScan @artemcm @cachemeifyoucan
9696
/include/swift/Driver*/ @artemcm
9797
/include/swift/Frontend*/ @artemcm @tshortli
98-
/include/swift/IDE/ @ahoppen @bnbarham @hamishknight @rintaro
98+
/include/swift/IDE/ @bnbarham @hamishknight @rintaro
9999
/include/swift/IRGen/ @rjmccall
100-
/include/swift/Index/ @ahoppen @bnbarham @hamishknight @rintaro
100+
/include/swift/Index/ @bnbarham @hamishknight @rintaro
101101
/include/swift/Markup/ @nkcsgexi
102102
/include/swift/Migrator/ @nkcsgexi
103103
/include/swift/Option/*Options* @tshortli
104-
/include/swift/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
104+
/include/swift/Parse/ @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
105105
/include/swift/PrintAsClang @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro
106-
/include/swift/Refactoring @ahoppen @bnbarham @hamishknight @rintaro
106+
/include/swift/Refactoring @bnbarham @hamishknight @rintaro
107107
/include/swift/Runtime/ @rjmccall @compnerd
108108
/include/swift/SIL/ @jckarter
109-
/include/swift/SIL/*Coverage* @ahoppen @bnbarham @hamishknight @rintaro
109+
/include/swift/SIL/*Coverage* @bnbarham @hamishknight @rintaro
110110
/include/swift/SIL/*DebugInfo* @adrian-prantl
111111
/include/swift/SIL/SILDebug* @adrian-prantl
112-
/include/swift/SIL/SILProfiler.h @ahoppen @bnbarham @hamishknight @rintaro
112+
/include/swift/SIL/SILProfiler.h @bnbarham @hamishknight @rintaro
113113
/include/swift/SILOptimizer/ @eeckstein
114114
/include/swift/SILOptimizer/Utils/Distributed* @ktoso
115115
/include/swift/Sema/ @hborla @slavapestov @xedin
@@ -134,7 +134,7 @@
134134
/lib/AST/Evaluator* @CodaFi @slavapestov
135135
/lib/AST/ModuleLoader.cpp @artemcm
136136
/lib/AST/RequirementMachine/ @slavapestov
137-
/lib/ASTGen/ @ahoppen @bnbarham @CodaFi @hamishknight @rintaro
137+
/lib/ASTGen/ @bnbarham @CodaFi @hamishknight @rintaro
138138
/lib/Basic/ @DougGregor
139139
/lib/Basic/Windows @compnerd
140140
/lib/ClangImporter @zoecarver @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @fahadnayyar @susmonteiro
@@ -146,25 +146,25 @@
146146
/lib/DriverTool/sil_opt* @eeckstein
147147
/lib/DriverTool/swift_symbolgraph_extract_main.cpp @QuietMisdreavus
148148
/lib/Frontend*/ @artemcm @tshortli
149-
/lib/IDE/ @ahoppen @bnbarham @hamishknight @rintaro
150-
/lib/IDETool/ @ahoppen @bnbarham @hamishknight @rintaro
149+
/lib/IDE/ @bnbarham @hamishknight @rintaro
150+
/lib/IDETool/ @bnbarham @hamishknight @rintaro
151151
/lib/IRGen/ @rjmccall
152-
/lib/IRGen/*Coverage* @ahoppen @bnbarham @hamishknight @rintaro
152+
/lib/IRGen/*Coverage* @bnbarham @hamishknight @rintaro
153153
/lib/IRGen/*Debug* @adrian-prantl
154154
/lib/IRGen/*Distributed* @ktoso
155-
/lib/Index/ @ahoppen @bnbarham @hamishknight @rintaro
155+
/lib/Index/ @bnbarham @hamishknight @rintaro
156156
/lib/Macros/Sources/SwiftMacros/Swiftify* @hnrklssn @Xazax-hun
157157
/lib/Markup/ @nkcsgexi
158158
/lib/Migrator/ @nkcsgexi
159-
/lib/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
159+
/lib/Parse/ @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
160160
/lib/PrintAsClang @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro
161-
/lib/Refactoring/ @ahoppen @bnbarham @hamishknight @rintaro
161+
/lib/Refactoring/ @bnbarham @hamishknight @rintaro
162162
/lib/SIL/ @jckarter
163163
/lib/SIL/**/*DebugInfo* @adrian-prantl
164-
/lib/SIL/IR/*Coverage* @ahoppen @bnbarham @hamishknight @rintaro
164+
/lib/SIL/IR/*Coverage* @bnbarham @hamishknight @rintaro
165165
/lib/SIL/IR/SILDebug* @adrian-prantl
166166
/lib/SIL/IR/SILLocation* @adrian-prantl
167-
/lib/SIL/IR/SILProfiler.cpp @ahoppen @bnbarham @hamishknight @rintaro
167+
/lib/SIL/IR/SILProfiler.cpp @bnbarham @hamishknight @rintaro
168168
/lib/SILGen/ @jckarter
169169
/lib/SILGen/*Distributed* @ktoso
170170
/lib/SILOptimizer/ @eeckstein
@@ -213,7 +213,7 @@
213213

214214
# test
215215
/test/*Demangl*/ @rjmccall
216-
/test/ASTGen/ @ahoppen @bnbarham @CodaFi @hamishknight @rintaro
216+
/test/ASTGen/ @bnbarham @CodaFi @hamishknight @rintaro
217217
/test/Concurrency/ @ktoso
218218
/test/Constraints/ @hborla @xedin
219219
/test/DebugInfo/ @adrian-prantl
@@ -223,14 +223,14 @@
223223
/test/Frontend/ @artemcm @tshortli
224224
/test/Generics/ @hborla @slavapestov
225225
/test/Generics/inverse* @kavon
226-
/test/IDE/ @ahoppen @bnbarham @hamishknight @rintaro
226+
/test/IDE/ @bnbarham @hamishknight @rintaro
227227
/test/IRGen/ @AnthonyLatsis @rjmccall
228-
/test/Index/ @ahoppen @bnbarham @hamishknight @rintaro
228+
/test/Index/ @bnbarham @hamishknight @rintaro
229229
/test/Interop/ @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro @hnrklssn
230230
/test/Macros/SwiftifyImport @hnrklssn @Xazax-hun
231231
/test/Migrator/ @nkcsgexi
232-
/test/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
233-
/test/Profiler @ahoppen @bnbarham @hamishknight @rintaro
232+
/test/Parse/ @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
233+
/test/Profiler @bnbarham @hamishknight @rintaro
234234
/test/Reflection/ @slavapestov
235235
/test/Runtime/ @rjmccall
236236
/test/SIL/ @jckarter
@@ -242,15 +242,15 @@
242242
/test/Sema/ @hborla @slavapestov @xedin
243243
/test/Sema/moveonly* @kavon
244244
/test/Serialization/ @xymus
245-
/test/SourceKit/ @ahoppen @bnbarham @hamishknight @rintaro
245+
/test/SourceKit/ @bnbarham @hamishknight @rintaro
246246
/test/SymbolGraph/ @QuietMisdreavus
247247
/test/abi/ @swiftlang/standard-librarians
248248
/test/decl/ @hborla @slavapestov
249249
/test/decl/protocol/ @AnthonyLatsis @hborla @slavapestov
250250
# FIXME: This file could have a dedicated directory.
251251
/test/decl/protocol/special/DistributedActor.swift @ktoso
252252
/test/expr/ @hborla @slavapestov @xedin
253-
/test/refactoring/ @ahoppen @bnbarham @hamishknight @rintaro
253+
/test/refactoring/ @bnbarham @hamishknight @rintaro
254254
/test/sil* @jckarter
255255
/test/sil-opt* @eeckstein
256256
/test/stdlib/ @swiftlang/standard-librarians
@@ -260,25 +260,25 @@
260260
# tools
261261
# TODO: /tools
262262
/tools/*reflection/ @slavapestov
263-
/tools/SourceKit @ahoppen @bnbarham @hamishknight @rintaro
263+
/tools/SourceKit @bnbarham @hamishknight @rintaro
264264
/tools/driver/ @artemcm
265265
/tools/lldb-moduleimport-test/ @adrian-prantl
266266
/tools/swift-demangle* @rjmccall
267-
/tools/swift-ide-test @ahoppen @bnbarham @hamishknight @rintaro
267+
/tools/swift-ide-test @bnbarham @hamishknight @rintaro
268268
/tools/swift-inspect @mikeash @al45tair @compnerd
269-
/tools/swift-refactor @ahoppen @bnbarham @hamishknight @rintaro
269+
/tools/swift-refactor @bnbarham @hamishknight @rintaro
270270

271271
# unittests
272272
/unittests/*Demangl*/ @rjmccall
273273
/unittests/AST/ @hborla @slavapestov @xedin
274274
/unittests/AST/*Evaluator* @CodaFi @slavapestov
275275
/unittests/DependencyScan/ @artemcm @cachemeifyoucan
276276
/unittests/Frontend*/ @artemcm @tshortli
277-
/unittests/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
277+
/unittests/Parse/ @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
278278
/unittests/Reflection/ @slavapestov
279279
/unittests/SIL/ @jckarter
280280
/unittests/Sema/ @hborla @xedin
281-
/unittests/SourceKit/ @ahoppen @bnbarham @rintaro @hamishknight
281+
/unittests/SourceKit/ @bnbarham @rintaro @hamishknight
282282
/unittests/runtime/ @rjmccall
283283

284284
# userdocs
@@ -288,25 +288,25 @@
288288
/utils/*windows* @compnerd
289289
/utils/build_swift/ @etcwilde @justice-adams-apple @shahmishal
290290
/utils/generate-xcode @hamishknight
291-
/utils/gyb_sourcekit_support/ @ahoppen @bnbarham @hamishknight @rintaro
292-
/utils/sourcekit_fuzzer/ @ahoppen @bnbarham @hamishknight @rintaro
291+
/utils/gyb_sourcekit_support/ @bnbarham @hamishknight @rintaro
292+
/utils/sourcekit_fuzzer/ @bnbarham @hamishknight @rintaro
293293
/utils/swift-xcodegen/ @hamishknight
294294
/utils/swift_build_support/ @etcwilde @justice-adams-apple @shahmishal
295-
/utils/swift_build_support/products/earlyswiftsyntax.py @ahoppen @bnbarham @hamishknight @rintaro
296-
/utils/swift_build_support/products/skstresstester.py @ahoppen @bnbarham @hamishknight @rintaro
297-
/utils/swift_build_support/products/sourcekitlsp.py @ahoppen @bnbarham @hamishknight @rintaro
298-
/utils/swift_build_support/products/swiftformat.py @ahoppen @allevato @bnbarham @hamishknight @rintaro
299-
/utils/swift_build_support/products/swiftsyntax.py @ahoppen @bnbarham @hamishknight @rintaro
295+
/utils/swift_build_support/products/earlyswiftsyntax.py @bnbarham @hamishknight @rintaro
296+
/utils/swift_build_support/products/skstresstester.py @bnbarham @hamishknight @rintaro
297+
/utils/swift_build_support/products/sourcekitlsp.py @bnbarham @hamishknight @rintaro
298+
/utils/swift_build_support/products/swiftformat.py @allevato @bnbarham @hamishknight @rintaro
299+
/utils/swift_build_support/products/swiftsyntax.py @bnbarham @hamishknight @rintaro
300300
/utils/update-checkout* @etcwilde @justice-adams-apple @shahmishal
301301
/utils/update_checkout/ @etcwilde @justice-adams-apple @shahmishal
302302
/utils/update_checkout/update-checkout-config.json @shahmishal
303303
/utils/vim/ @compnerd
304304

305305
# validation-test
306306
/validation-test/Driver/ @artemcm
307-
/validation-test/IDE/ @ahoppen @bnbarham @rintaro @hamishknight
307+
/validation-test/IDE/ @bnbarham @rintaro @hamishknight
308308
/validation-test/IRGen/ @rjmccall
309-
/validation-test/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
309+
/validation-test/Parse/ @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
310310
/validation-test/Reflection/ @slavapestov
311311
/validation-test/Runtime/ @rjmccall
312312
/validation-test/SIL/ @jckarter

‎CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1684,7 +1684,8 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
16841684
-DCMAKE_C_COMPILER_TARGET:STRING=${stdlib_target_triple}
16851685
-DCMAKE_CXX_COMPILER_TARGET:STRING=${stdlib_target_triple}
16861686
-DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
1687-
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM})
1687+
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
1688+
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE)
16881689
endforeach()
16891690
endforeach()
16901691
endif()

‎Runtimes/Core/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,10 @@ add_subdirectory(Demangling)
209209
add_subdirectory(Threading)
210210
add_subdirectory(runtime)
211211
add_subdirectory(stubs)
212-
add_subdirectory(CommandLineSupport)
213212
add_subdirectory(core)
213+
if(SwiftCore_ENABLE_COMMANDLINE_SUPPORT)
214+
add_subdirectory(CommandLineSupport)
215+
endif()
214216
if(SwiftCore_ENABLE_ONONESUPPORT)
215217
add_subdirectory(SwiftOnoneSupport)
216218
endif()

‎Runtimes/Core/CommandLineSupport/CMakeLists.txt

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
1-
if(SwiftCore_ENABLE_COMMANDLINE_SUPPORT)
2-
add_library(swiftCommandLineSupport STATIC CommandLine.cpp)
3-
target_include_directories(swiftCommandLineSupport PRIVATE
4-
"${SwiftCore_SWIFTC_SOURCE_DIR}/include"
5-
"${PROJECT_BINARY_DIR}/include")
6-
target_compile_definitions(swiftCommandLineSupport PUBLIC
7-
-DSWIFT_STDLIB_HAS_COMMANDLINE)
8-
target_compile_definitions(swiftCommandLineSupport PRIVATE
9-
$<$<BOOL:${BUILD_SHARED_LIBS}>:-DswiftCore_EXPORTS>)
10-
11-
target_link_libraries(swiftCommandLineSupport PRIVATE
12-
swiftShims)
13-
14-
if(NOT BUILD_SHARED_LIBS)
15-
install(TARGETS swiftCommandLineSupport
16-
EXPORT SwiftCoreTargets
17-
COMPONENT SwiftCore_runtime)
18-
endif()
19-
endif()
1+
# TODO(etcwilde) migrate this into subdir subdirectory once the migration is
2+
# completed.
3+
target_sources(swiftCore PRIVATE
4+
CommandLine.cpp)
5+
target_compile_definitions(swiftCore PUBLIC
6+
-DSWIFT_STDLIB_HAS_COMMANDLINE)
7+
target_include_directories(swiftCore PRIVATE
8+
"${SwiftCore_SWIFTC_SOURCE_DIR}/include"
9+
"${PROJECT_BINARY_DIR}/include")

‎Runtimes/Core/core/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ if(NOT LINUX AND NOT ANDROID)
259259
endif()
260260

261261
if(SwiftCore_ENABLE_COMMANDLINE_SUPPORT)
262-
target_sources(swiftCore PRIVATE CommandLine.swift)
263-
target_link_libraries(swiftCore PRIVATE swiftCommandLineSupport)
262+
target_sources(swiftCore PRIVATE
263+
CommandLine.swift)
264264
endif()
265265

266266
if(SwiftCore_ENABLE_VECTOR_TYPES)

‎Runtimes/Resync.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ endforeach()
9696
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Core/Info.plist.in")
9797
copy_files("" "Core" FILES "Info.plist.in")
9898

99+
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Supplemental/Synchronization/Info.plist.in")
100+
copy_files("" "Supplemental/Synchronization" FILES "Info.plist.in")
101+
99102
# Platform Overlays
100103

101104
# Copy magic linker symbols
@@ -153,6 +156,8 @@ copy_files(public/Platform Overlay/Windows/CRT
153156
# libraries, and test support libraries.
154157

155158
# Supplemental Libraries
159+
copy_library_sources("Synchronization" "public" "Supplemental")
160+
156161

157162
# Copy StringProcessing, RegexParser, RegexBuilder
158163
if(NOT DEFINED StringProcessing_ROOT_DIR)

‎Runtimes/Supplemental/CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ endif()
2222

2323
set(COMMON_OPTIONS
2424
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
25+
-DSwift_SDKROOT=${Swift_SDKROOT}
2526
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
2627
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
2728
-DCMAKE_INSTALL_NAME_DIR=${CMAKE_INSTALL_NAME_DIR}
@@ -34,6 +35,7 @@ set(COMMON_OPTIONS
3435
-DCMAKE_C_COMPILER_TARGET=${CMAKE_C_COMPILER_TARGET}
3536
-DCMAKE_CXX_COMPILER_TARGET=${CMAKE_CXX_COMPILER_TARGET}
3637
-DCMAKE_Swift_COMPILER_TARGET=${CMAKE_Swift_COMPILER_TARGET}
38+
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=${CMAKE_FIND_PACKAGE_PREFER_CONFIG}
3739
${SwiftCore_DIR_FLAG}
3840
${MAKE_PROGRAM_FLAG})
3941

@@ -47,3 +49,14 @@ if(SwiftRuntime_ENABLE_stringprocessing)
4749
CMAKE_ARGS
4850
${COMMON_OPTIONS})
4951
endif()
52+
53+
# Synchronization
54+
if(SwiftRuntime_ENABLE_synchronization)
55+
ExternalProject_Add(Synchronization
56+
PREFIX "Synchronization"
57+
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Synchronization"
58+
INSTALL_DIR "${CMAKE_INSTALL_PREFIX}"
59+
INSTALL_COMMAND ""
60+
CMAKE_ARGS
61+
${COMMON_OPTIONS})
62+
endif()

‎Runtimes/Supplemental/StringProcessing/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
cmake_minimum_required(VERSION 3.29)
22

3-
set(CMAKE_POSITION_INDEPENDENT_CODE YES)
4-
5-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake/modules")
6-
73
if(POLICY CMP0157 AND CMAKE_Swift_COMPILER_USE_OLD_DRIVER)
84
cmake_policy(SET CMP0157 OLD)
95
endif()
@@ -20,11 +16,15 @@ if(NOT PROJECT_IS_TOP_LEVEL)
2016
message(FATAL_ERROR "Swift StringProcessing must build as a standalone project")
2117
endif()
2218

19+
set(CMAKE_POSITION_INDEPENDENT_CODE YES)
20+
21+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake/modules")
22+
2323
set(${PROJECT_NAME}_SWIFTC_SOURCE_DIR
2424
"${PROJECT_SOURCE_DIR}/../../../"
2525
CACHE FILEPATH "Path to the root source directory of the Swift compiler")
2626

27-
find_package(SwiftCore)
27+
find_package(SwiftCore REQUIRED)
2828

2929
include(GNUInstallDirs)
3030

0 commit comments

Comments
 (0)