Skip to content

Commit 55663f6

Browse files
tbkkatbkka
authored
Merge branch 'main' into tbkka-assertions-3
2 parents 50b2b1b + 4993f4b commit 55663f6

File tree

1,066 files changed

+17723
-9859
lines changed

Some content is hidden

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

1,066 files changed

+17723
-9859
lines changed

‎.github/CODEOWNERS

Lines changed: 83 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
# TODO: /apinotes
3939

4040
# benchmark
41-
# TODO: /benchmark
41+
/benchmark @eeckstein
4242

4343
# bindings
4444
# TODO: /bindings
@@ -47,83 +47,107 @@
4747
/cmake/**/*Windows* @compnerd
4848

4949
# docs
50-
/docs/Generics.rst @slavapestov
51-
/docs/Generics/ @slavapestov
50+
/docs/CrossCompilationModel.md @MaxDesiatov
51+
/docs/Generics @slavapestov
5252
/docs/HowToGuides/ @AnthonyLatsis @LucianoPAlmeida @xedin
53+
/docs/Optimizer* @eeckstein
54+
/docs/SIL* @jckarter
55+
/docs/Windows* @compnerd
5356

5457
# include
58+
/include/swift-c/DependencyScan/ @artemcm
59+
/include/swift/*Demangl*/ @rjmccall
5560
/include/swift/AST/ @hborla @slavapestov @xedin
5661
/include/swift/AST/*Availability* @tshortli
5762
/include/swift/AST/*Conformance* @slavapestov
63+
/include/swift/AST/*Demangl* @rjmccall
5864
/include/swift/AST/*Distributed* @ktoso
5965
/include/swift/AST/*Generic* @hborla @slavapestov
6066
/include/swift/AST/*Protocol* @hborla @slavapestov
6167
/include/swift/AST/*Requirement* @hborla @slavapestov
6268
/include/swift/AST/*Substitution* @slavapestov
63-
/include/swift/AST/Evaluator* @CodaFi @slavapestov
6469
/include/swift/AST/DiagnosticsParse.def @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
70+
/include/swift/AST/Evaluator* @CodaFi @slavapestov
71+
/include/swift/Basic/ @DougGregor
6572
/include/swift/ClangImporter @zoecarver @hyp @egorzhdan @beccadax @ian-twilightcoder
6673
/include/swift/DependencyScan @artemcm
67-
/include/swift/Driver @artemcm
68-
# TODO: /include/swift/IRGen/
74+
/include/swift/Driver*/ @artemcm
75+
/include/swift/Frontend*/ @artemcm @tshortli
6976
/include/swift/IDE/ @ahoppen @bnbarham @hamishknight @rintaro
77+
/include/swift/IRGen/ @rjmccall
7078
/include/swift/Index/ @ahoppen @bnbarham @hamishknight @rintaro
79+
/include/swift/Markup/ @nkcsgexi
80+
/include/swift/Migrator/ @nkcsgexi
7181
/include/swift/Option/*Options* @tshortli
7282
/include/swift/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
7383
/include/swift/PrintAsClang @zoecarver @hyp @egorzhdan
7484
/include/swift/Refactoring @ahoppen @bnbarham @hamishknight @rintaro
75-
# TODO: /include/swift/SIL/
76-
# TODO: /include/swift/SILOptimizer/
85+
/include/swift/Runtime/ @rjmccall
86+
/include/swift/SIL/ @jckarter
7787
/include/swift/SIL/*Coverage* @ahoppen @bnbarham @hamishknight @rintaro
78-
/include/swift/SIL/SILProfiler.h @ahoppen @bnbarham @hamishknight @rintaro
88+
/include/swift/SIL/*DebugInfo* @adrian-prantl
7989
/include/swift/SIL/SILDebug* @adrian-prantl
90+
/include/swift/SIL/SILProfiler.h @ahoppen @bnbarham @hamishknight @rintaro
91+
/include/swift/SILOptimizer/ @eeckstein
8092
/include/swift/SILOptimizer/Utils/Distributed* @ktoso
8193
/include/swift/Sema/ @hborla @slavapestov @xedin
8294
/include/swift/Sema/CS* @hborla @xedin
8395
/include/swift/Sema/Constraint* @hborla @xedin
96+
/include/swift/Serialization/ @xymus
97+
/include/swift/Serialization/SerializedModuleLoader* @artemcm
98+
/include/swift/SwiftRemoteMirror/ @slavapestov
8499
/include/swift/SymbolGraphGen/ @QuietMisdreavus
85100
/include/swift/Threading @al45tair
86101

87102
# lib
103+
/lib/*Demangl*/ @rjmccall
88104
/lib/AST/ @hborla @slavapestov @xedin
89105
/lib/AST/*Availability* @tshortli
90-
/lib/AST/ASTPrinter.cpp @hborla @slavapestov @xedin @tshortli
91106
/lib/AST/*Conformance* @slavapestov
107+
/lib/AST/*Demangl* @rjmccall
92108
/lib/AST/*Generic* @hborla @slavapestov
93109
/lib/AST/*Requirement* @hborla @slavapestov
94110
/lib/AST/*Substitution @slavapestov
111+
/lib/AST/ASTPrinter.cpp @hborla @slavapestov @xedin @tshortli
95112
/lib/AST/Evaluator* @CodaFi @slavapestov
96113
/lib/AST/ModuleLoader.cpp @artemcm
97114
/lib/AST/RequirementMachine/ @slavapestov
98115
/lib/ASTGen/ @ahoppen @bnbarham @CodaFi @hamishknight @rintaro
116+
/lib/Basic/ @DougGregor
99117
/lib/Basic/Windows @compnerd
100118
/lib/ClangImporter @zoecarver @hyp @egorzhdan @beccadax @ian-twilightcoder
101119
/lib/ClangImporter/DWARFImporter* @adrian-prantl
102120
/lib/DependencyScan @artemcm
103-
/lib/Driver @artemcm
121+
/lib/Driver*/ @artemcm
104122
/lib/DriverTool/autolink_extract_main.cpp @MaxDesiatov @etcwilde
123+
/lib/DriverTool/sil* @jckarter
124+
/lib/DriverTool/sil_opt* @eeckstein
105125
/lib/DriverTool/swift_symbolgraph_extract_main.cpp @QuietMisdreavus
106-
/lib/Frontend/*ModuleInterface* @artemcm @tshortli
107-
# TODO: /lib/IRGen/
126+
/lib/Frontend*/ @artemcm @tshortli
108127
/lib/IDE/ @ahoppen @bnbarham @hamishknight @rintaro
109128
/lib/IDETool/ @ahoppen @bnbarham @hamishknight @rintaro
129+
/lib/IRGen/ @rjmccall
110130
/lib/IRGen/*Coverage* @ahoppen @bnbarham @hamishknight @rintaro
111131
/lib/IRGen/*Debug* @adrian-prantl
112132
/lib/IRGen/*Distributed* @ktoso
113133
/lib/Index/ @ahoppen @bnbarham @hamishknight @rintaro
134+
/lib/Markup/ @nkcsgexi
135+
/lib/Migrator/ @nkcsgexi
114136
/lib/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
115137
/lib/PrintAsClang @zoecarver @hyp @egorzhdan
116138
/lib/Refactoring/ @ahoppen @bnbarham @hamishknight @rintaro
117-
# TODO: /lib/SIL/
139+
/lib/SIL/ @jckarter
140+
/lib/SIL/**/*DebugInfo* @adrian-prantl
118141
/lib/SIL/IR/*Coverage* @ahoppen @bnbarham @hamishknight @rintaro
119-
/lib/SIL/IR/SILProfiler.cpp @ahoppen @bnbarham @hamishknight @rintaro
120142
/lib/SIL/IR/SILDebug* @adrian-prantl
121143
/lib/SIL/IR/SILLocation* @adrian-prantl
122-
# TODO: /lib/SILGen/
144+
/lib/SIL/IR/SILProfiler.cpp @ahoppen @bnbarham @hamishknight @rintaro
145+
/lib/SILGen/ @jckarter
123146
/lib/SILGen/*Distributed* @ktoso
124-
# TODO: /lib/SILOptimizer/
125-
/lib/SILOptimizer/Mandatory/FlowIsolation.cpp @kavon
147+
/lib/SILOptimizer/ @eeckstein
148+
/lib/SILOptimizer/**/*DebugInfo* @adrian-prantl
126149
/lib/SILOptimizer/Mandatory/ConsumeOperator* @kavon
150+
/lib/SILOptimizer/Mandatory/FlowIsolation.cpp @kavon
127151
/lib/SILOptimizer/Mandatory/MoveOnly* @kavon
128152
/lib/SILOptimizer/Utils/Distributed* @ktoso
129153
/lib/Sema/ @hborla @slavapestov @xedin
@@ -136,77 +160,100 @@
136160
/lib/Sema/TypeCheckDistributed* @hborla @ktoso @xedin
137161
/lib/Sema/TypeCheckProtocol* @AnthonyLatsis @hborla @slavapestov
138162
/lib/Sema/TypeCheckType* @AnthonyLatsis @hborla @slavapestov @xedin
139-
/lib/Serialization/SerializedModuleLoader.cpp @artemcm
163+
/lib/Serialization/ @xymus
164+
/lib/Serialization/SerializedModuleLoader* @artemcm
165+
/lib/SwiftRemoteMirror/ @slavapestov
140166
/lib/SymbolGraphGen @QuietMisdreavus
141167
/lib/Threading @al45tair
142168

143169
# localization
144170
# TODO: /localization
145171

146172
# stdlib
147-
/stdlib/ @apple/standard-librarians
173+
/stdlib/ @swiftlang/standard-librarians
174+
/stdlib/private/*Runtime*/ @rjmccall
175+
/stdlib/private/SwiftReflectionTest/ @slavapestov
176+
/stdlib/public/*Demangl*/ @rjmccall
148177
/stdlib/public/Backtracing/ @al45tair
149178
/stdlib/public/Concurrency/ @ktoso
150179
/stdlib/public/Cxx/ @zoecarver @hyp @egorzhdan
151180
/stdlib/public/Distributed/ @ktoso
152181
/stdlib/public/Observation/ @phausler
182+
/stdlib/public/SwiftRemoteMirror/ @slavapestov
153183
/stdlib/public/Threading/ @al45tair
154184
/stdlib/public/Windows/ @compnerd
155185
/stdlib/public/libexec/swift-backtrace/ @al45tair
156186
/stdlib/public/runtime/ @mikeash @al45tair
187+
/stdlib/tools/swift-reflection-test/ @slavapestov
157188

158189
# test
190+
/test/*Demangl*/ @rjmccall
159191
/test/ASTGen/ @ahoppen @bnbarham @CodaFi @hamishknight @rintaro
160192
/test/Concurrency/ @ktoso
161193
/test/Constraints/ @hborla @xedin
162194
/test/DebugInfo/ @adrian-prantl
163195
/test/Distributed/ @ktoso
164196
/test/Driver/ @artemcm
165197
/test/Driver/static* @MaxDesiatov @etcwilde
198+
/test/Frontend/ @artemcm @tshortli
166199
/test/Generics/ @hborla @slavapestov
167200
/test/Generics/inverse* @kavon
168-
# TODO: /test/IRGen/
169201
/test/IDE/ @ahoppen @bnbarham @hamishknight @rintaro
202+
/test/IRGen/ @rjmccall
170203
/test/Index/ @ahoppen @bnbarham @hamishknight @rintaro
171204
/test/Interop/ @zoecarver @hyp @egorzhdan
205+
/test/Migrator/ @nkcsgexi
172206
/test/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
173207
/test/Profiler @ahoppen @bnbarham @hamishknight @rintaro
174-
# TODO: /test/SIL/
175-
# TODO: /test/SILGen/
176-
# TODO: /test/SILOptimizer/
208+
/test/Reflection/ @slavapestov
209+
/test/Runtime/ @rjmccall
210+
/test/SIL/ @jckarter
211+
/test/SILGen/ @jckarter
212+
/test/SILOptimizer/ @eeckstein
177213
/test/SILOptimizer/moveonly* @kavon
178214
/test/SILOptimizer/noimplicitcopy* @kavon
179215
/test/ScanDependencies/ @artemcm
180216
/test/Sema/ @hborla @slavapestov @xedin
181217
/test/Sema/moveonly* @kavon
218+
/test/Serialization/ @xymus
182219
/test/SourceKit/ @ahoppen @bnbarham @hamishknight @rintaro
183220
/test/SymbolGraph/ @QuietMisdreavus
184-
/test/abi/ @apple/standard-librarians
221+
/test/abi/ @swiftlang/standard-librarians
185222
/test/decl/ @hborla @slavapestov
186223
/test/decl/protocol/ @AnthonyLatsis @hborla @slavapestov
187224
# FIXME: This file could have a dedicated directory.
188225
/test/decl/protocol/special/DistributedActor.swift @ktoso
189226
/test/expr/ @hborla @slavapestov @xedin
190227
/test/refactoring/ @ahoppen @bnbarham @hamishknight @rintaro
191-
/test/stdlib/ @apple/standard-librarians
228+
/test/sil* @jckarter
229+
/test/sil-opt* @eeckstein
230+
/test/stdlib/ @swiftlang/standard-librarians
192231
/test/stmt/ @hborla @xedin
193232
/test/type/ @hborla @slavapestov @xedin
194233

195234
# tools
196235
# TODO: /tools
236+
/tools/*reflection/ @slavapestov
197237
/tools/SourceKit @ahoppen @bnbarham @hamishknight @rintaro
238+
/tools/driver/ @artemcm
198239
/tools/lldb-moduleimport-test/ @adrian-prantl
240+
/tools/swift-demangle* @rjmccall
199241
/tools/swift-ide-test @ahoppen @bnbarham @hamishknight @rintaro
200242
/tools/swift-inspect @mikeash @al45tair @compnerd
201243
/tools/swift-refactor @ahoppen @bnbarham @hamishknight @rintaro
202244

203245
# unittests
246+
/unittests/*Demangl*/ @rjmccall
204247
/unittests/AST/ @hborla @slavapestov @xedin
205248
/unittests/AST/*Evaluator* @CodaFi @slavapestov
249+
/unittests/DependencyScan/ @artemcm
250+
/unittests/FrontendTool/ @artemcm @tshortli
206251
/unittests/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
207-
# TODO: /unittests/SIL/
252+
/unittests/Reflection/ @slavapestov
253+
/unittests/SIL/ @jckarter
208254
/unittests/Sema/ @hborla @xedin
209255
/unittests/SourceKit/ @ahoppen @bnbarham @rintaro @hamishknight
256+
/unittests/runtime/ @rjmccall
210257

211258
# userdocs
212259
# TODO: /userdocs
@@ -225,11 +272,15 @@
225272
/utils/vim/ @compnerd
226273

227274
# validation-test
228-
# TODO: /validation-test/IRGen/
275+
/validation-test/Driver/ @artemcm
229276
/validation-test/IDE/ @ahoppen @bnbarham @rintaro @hamishknight
277+
/validation-test/IRGen/ @rjmccall
230278
/validation-test/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
231-
# TODO: /validation-test/SIL/
232-
# TODO: /validation-test/SILGen/
233-
# TODO: /validation-test/SILOptimizer/
279+
/validation-test/Reflection/ @slavapestov
280+
/validation-test/Runtime/ @rjmccall
281+
/validation-test/SIL/ @jckarter
282+
/validation-test/SILGen/ @jckarter
283+
/validation-test/SILOptimizer/ @eeckstein
234284
/validation-test/Sema/ @hborla @slavapestov @xedin
235-
/validation-test/stdlib/ @apple/standard-librarians
285+
/validation-test/Serialization/ @xymus
286+
/validation-test/stdlib/ @swiftlang/standard-librarians

‎.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ body:
3434
label: Reproduction
3535
description: >
3636
Provide a test case, preferably in a Markdown codeblock, and explain
37-
how to build or run it to reproduce the problem. If the problem is a
38-
poor or unexpected error, warning, fix-it, or output, please show
39-
them. Consider reducing the test case to the smallest amount of code
37+
how to build or run it to reproduce the problem.
38+
If the problem is a poor or unexpected diagnostic, fix-it, or other
39+
output, please show this output as is.
40+
For example, paste it from the terminal.
41+
Consider reducing the test case to the smallest amount of code
4042
possible — a smaller test case is easier to reason about and more
4143
appealing to contributors.
4244
value: |

‎.github/PULL_REQUEST_TEMPLATE/release.md

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎.github/pull_request_template.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
<!-- What's in this pull request? -->
2-
Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
3-
41
<!--
5-
If this pull request resolves any GitHub issues, link them.
6-
For information about linking a pull request to an issue, see:
2+
If this pull request is targeting a release branch, please fill out the
3+
following form:
4+
https://github.com/swiftlang/.github/blob/main/PULL_REQUEST_TEMPLATE/release.md?plain=1
5+
6+
Otherwise, replace this comment with a description of your changes and
7+
rationale. Provide links to external references/discussions if appropriate.
8+
If this pull request resolves any GitHub issues, link them like so:
9+
10+
Resolves <link to issue>, resolves <link to another issue>.
11+
12+
For more information about linking a pull request to an issue, see:
713
https://docs.github.com/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue
814
-->
9-
Resolves #NNNNN, fix apple/llvm-project#MMMMM.
1015

1116
<!--
1217
Before merging this pull request, you must run the Swift continuous integration tests.

‎SwiftCompilerSources/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,13 @@ function(add_swift_compiler_modules_library name)
181181
# Workaround a crash in the LoadableByAddress pass
182182
# https://github.com/apple/swift/issues/73254
183183
list(APPEND swift_compile_options "-Xllvm" "-sil-disable-pass=loadable-address")
184+
185+
# The STL in VS 17.10 requires Clang 17 or higher, but bootstrapping generally uses toolchains with older versions
186+
# versions of Clang. Swift 6 toolchains are the first to include Clang 17, so if we are on Windows and using an
187+
# earlier toolchain, we need to relax to relax this requirement with ALLOW_COMPILER_AND_STL_VERSION_MISMATCH.
188+
if (CMAKE_Swift_COMPILER_VERSION VERSION_LESS 6.0)
189+
list(APPEND swift_compile_options "-Xcc" "-D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH")
190+
endif()
184191
else()
185192
list(APPEND sdk_option "-I" "${swift_exec_bin_dir}/../lib" "-I" "${sdk_path}/usr/lib")
186193
endif()

0 commit comments

Comments
 (0)