Merge branch 'main' into es-pkg-acl

Author: elsh

.github/CODEOWNERS

@@ -1,13 +1,33 @@
 # Lines starting with '#' are comments.
-# Each line is a file pattern followed by one or more owners.
+# Each line is a case-sensitive file pattern followed by one or more owners.
 # Order is important. The last matching pattern has the most precedence.
+# More information: https://docs.github.com/en/articles/about-code-owners
 
-# Owners of ASTGen
-lib/ASTGen @zoecarver @CodaFi
+# .github
+/.github/                         @shahmishal
+/.github/CODEOWNERS               @AnthonyLatsis @shahmishal
+/.github/ISSUE_TEMPLATE/          @AnthonyLatsis @hborla @LucianoPAlmeida @shahmishal @xedin
+/.github/PULL_REQUEST_TEMPLATE.md @AnthonyLatsis @hborla @LucianoPAlmeida @shahmishal @xedin
+
+# docs
+/docs/HowToGuides/ @AnthonyLatsis @LucianoPAlmeida @xedin
+/docs/Generics/    @slavapestov
+/docs/Generics.rst @slavapestov
+
+# Standard Library
+# TODO: /stdlib/
+/stdlib/public/Cxx/        @zoecarver @hyp @egorzhdan
+/stdlib/public/Distributed/ @ktoso
+/stdlib/public/Windows/    @compnerd
+# TODO: /*test/stdlib/
+# TODO: /unittests/stdlib/
+
+# ASTGen
+/lib/ASTGen/  @zoecarver @CodaFi
+/test/ASTGen/ @zoecarver @CodaFi
 
 # Dependency scanning
 include/swift/DependencyScan                 @artemcm
-lib/AST/ModuleLoader.cpp                     @artemcm
 lib/DependencyScan                           @artemcm
 lib/Frontend/ModuleInterfaceLoader.cpp       @artemcm
 lib/Serialization/SerializedModuleLoader.cpp @artemcm
@@ -19,9 +39,10 @@ lib/Driver           @artemcm
 test/Driver          @artemcm
 
 # Owners of the parser
-include/swift/Parse @ahoppen @bnbarham @CodaFi @DougGregor @rintaro
-lib/Parse           @ahoppen @bnbarham @CodaFi @DougGregor @rintaro
-test/Parse          @ahoppen @bnbarham @CodaFi @DougGregor @rintaro
+/include/swift/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @rintaro
+/lib/Parse/           @ahoppen @bnbarham @CodaFi @DougGregor @rintaro
+/*test/Parse/         @ahoppen @bnbarham @CodaFi @DougGregor @rintaro
+/unittests/Parse/     @ahoppen @bnbarham @CodaFi @DougGregor @rintaro
 
 SwiftCompilerSources @eeckstein
 
@@ -30,7 +51,6 @@ include/swift/ClangImporter @zoecarver @hyp @egorzhdan
 include/swift/PrintAsClang  @zoecarver @hyp @egorzhdan
 lib/ClangImporter           @zoecarver @hyp @egorzhdan
 lib/PrintAsClang            @zoecarver @hyp @egorzhdan
-stdlib/public/Cxx           @zoecarver @hyp @egorzhdan
 test/Interop                @zoecarver @hyp @egorzhdan
 
 # Threading implementation
@@ -40,5 +60,89 @@ lib/Threading           @al45tair
 # Windows support
 cmake/**/*Windows*    @compnerd
 lib/Basic/Windows     @compnerd
-stdlib/public/Windows @compnerd
 utils/*windows*       @compnerd
+
+# Repository checkout utils
+
+/utils/update_checkout/ @shahmishal
+/utils/update-checkout* @shahmishal
+
+
+# AST
+/include/swift/AST/               @hborla @slavapestov @xedin
+/include/swift/AST/*Conformance*  @slavapestov
+/include/swift/AST/*Distributed*  @ktoso
+/include/swift/AST/Evaluator*     @CodaFi @slavapestov
+/include/swift/AST/*Generic*      @hborla @slavapestov
+/include/swift/AST/*Protocol*     @hborla @slavapestov
+/include/swift/AST/*Requirement*  @hborla @slavapestov
+/include/swift/AST/*Substitution* @slavapestov
+/lib/AST/                         @hborla @slavapestov @xedin
+/lib/AST/*Conformance*            @slavapestov
+/lib/AST/Evaluator*               @CodaFi @slavapestov
+/lib/AST/*Generic*                @hborla @slavapestov
+/lib/AST/ModuleLoader.cpp         @artemcm
+/lib/AST/*Requirement*            @hborla @slavapestov
+/lib/AST/RequirementMachine/      @slavapestov
+/lib/AST/*Substitution            @slavapestov
+/unittests/AST/                   @hborla @slavapestov @xedin
+/unittests/AST/*Evaluator*        @CodaFi @slavapestov
+
+# Sema
+/include/swift/Sema/                     @hborla @slavapestov @xedin
+/include/swift/Sema/Constraint*          @hborla @xedin
+/include/swift/Sema/CS*                  @hborla @xedin
+/lib/Sema/                               @hborla @slavapestov @xedin
+/lib/Sema/Constraint*                    @hborla @xedin
+/lib/Sema/CS*                            @hborla @xedin
+/lib/Sema/CodeSynthesisDistributed*      @hborla @ktoso
+/lib/Sema/DerivedConformance*            @slavapestov
+/lib/Sema/DerivedConformanceDistributed* @ktoso @slavapestov
+/lib/Sema/TypeCheckDistributed*          @hborla @ktoso @xedin
+/lib/Sema/TypeCheckType*                 @AnthonyLatsis @hborla @slavapestov @xedin
+/lib/Sema/TypeCheckProtocol*             @AnthonyLatsis @hborla @slavapestov
+/test/Constraints/                       @hborla @xedin
+/test/decl/                              @hborla @slavapestov
+/test/decl/protocol/                     @AnthonyLatsis @hborla @slavapestov
+# FIXME: This file could have a dedicated directory.
+/test/decl/protocol/special/DistributedActor.swift  @ktoso
+# FIXME: Should there be a 'Sema' folder under 'Distributed'? Or perhaps it
+# should be the other way around, i.e 'Sema/Distributed', 'SILGen/Distributed',
+# etc.?
+/test/Distributed/*                      @ktoso
+# FIXME: Is there a better way to structure this high-level 'Inputs' dir.? We
+# want only the Sema bits here.
+/test/Distributed/Inputs/                @ktoso
+/test/expr/                              @hborla @slavapestov @xedin
+/test/Generics/                          @hborla @slavapestov
+/test/Sema/                              @hborla @slavapestov @xedin
+/test/stmt/                              @hborla @xedin
+/test/type/                              @hborla @slavapestov @xedin
+/validation-test/Sema/                   @hborla @slavapestov @xedin
+/unittests/Sema/                         @hborla @xedin
+
+# SIL/SILGen
+# TODO: /include/swift/SIL/
+# TODO: /lib/SIL/
+# TODO: /lib/SILGen/
+/lib/SILGen/*Distributed* @ktoso
+/test/Distributed/SIL/    @ktoso
+# TODO: /*test/SIL/
+# TODO: /*test/SILGen/
+# TODO: /unittests/SIL/
+
+# SILOptimizer
+# TODO: /include/swift/SILOptimizer/
+/include/swift/SILOptimizer/Utils/Distributed* @ktoso
+# TODO: /lib/SILOptimizer/
+/lib/SILOptimizer/Utils/Distributed*           @ktoso
+# TODO: /*test/SILOptimizer/
+
+# IRGen
+# TODO: /include/swift/IRGen/
+# TODO: /lib/IRGen/
+/lib/IRGen/*Distributed* @ktoso
+# TODO: /*test/IRGen/
+
+# TODO: Find a better place for this entry.
+/test/Distributed/Runtime @ktoso

CMakeLists.txt

@@ -268,7 +268,7 @@ set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
 # SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
 # can be reused when a new version of Swift comes out (assuming the user hasn't
 # manually set it as part of their own CMake configuration).
-set(SWIFT_VERSION "5.8")
+set(SWIFT_VERSION "5.9")
 
 set(SWIFT_VENDOR "" CACHE STRING
     "The vendor name of the Swift compiler")
@@ -460,6 +460,7 @@ set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX "10.9")
 set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS "7.0")
 set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_TVOS "9.0")
 set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_WATCHOS "2.0")
+set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_MACCATALYST "13.1")
 
 #
 # User-configurable debugging options.
@@ -564,6 +565,10 @@ option(SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING
   "Enable experimental string processing"
   FALSE)
 
+option(SWIFT_ENABLE_EXPERIMENTAL_REFLECTION
+  "Enable build of the Swift reflection module"
+  FALSE)
+
 option(SWIFT_ENABLE_DISPATCH
   "Enable use of libdispatch"
   TRUE)
@@ -585,6 +590,13 @@ option(SWIFT_THREADING_PACKAGE
    Valid package names are 'pthreads', 'darwin', 'linux', 'win32', 'c11', 'none'
    or the empty string for the SDK default.")
 
+option(SWIFT_ENABLE_MACCATALYST
+  "Build the Standard Library and overlays with MacCatalyst support"
+  FALSE)
+
+set(SWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST "14.5" CACHE STRING
+  "Minimum deployment target version for macCatalyst")
+
 #
 # End of user-configurable options.
 #
@@ -1102,6 +1114,7 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
   message(STATUS "Distributed Support:                ${SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED}")
   message(STATUS "String Processing Support:          ${SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING}")
   message(STATUS "Unicode Support:                    ${SWIFT_STDLIB_ENABLE_UNICODE_DATA}")
+  message(STATUS "Reflection Support:                 ${SWIFT_ENABLE_EXPERIMENTAL_REFLECTION}")
   message(STATUS "")
 else()
   message(STATUS "Not building Swift standard library, SDK overlays, and runtime")
@@ -1188,8 +1201,8 @@ else()
     add_subdirectory(stdlib/public/BackDeployConcurrency)
   endif()
 
-  # Some tools (e.g. swift-reflection-dump) rely on a host swiftReflection, so
-  # ensure we build that when building tools.
+  # Some tools (e.g. swift-reflection-dump) rely on a host swiftRemoteInspection,
+  # so ensure we build that when building tools.
   if(SWIFT_INCLUDE_TOOLS)
     add_subdirectory(stdlib/public/SwiftShims/swift/shims)
   endif()

README.md

@@ -17,6 +17,7 @@
 | **CentOS 7** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-centos-7/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-centos-7)|
 | **Amazon Linux 2** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-amazon-linux-2/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-amazon-linux-2)|
 | **Amazon Linux 2** | AArch64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-amazon-linux-2-aarch64/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-amazon-linux-2-aarch64)|
+| **Universal Base Image 9** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubi-9/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubi-9)|
 
 **Swift Community-Hosted CI Platforms**
 
@@ -31,7 +32,7 @@
 
 Swift is a high-performance system programming language.  It has a clean
 and modern syntax, offers seamless access to existing C and Objective-C code
-and frameworks, and is memory safe by default.
+and frameworks, and is memory-safe by default.
 
 Although inspired by Objective-C and many other languages, Swift is not itself a
 C-derived language. As a complete and independent language, Swift packages core

SwiftCompilerSources/README.md

@@ -156,9 +156,9 @@ With instruction passes it's possible to implement small peephole optimizations
 
 To add a new instruction pass:
 
-* add a `SWIFT_INSTRUCTION_PASS` entry in `Passes.def`
+* add a `SWIFT_SILCOMBINE_PASS` entry in `Passes.def`
 * create a new Swift file in `SwiftCompilerSources/Optimizer/InstructionPasses`
-* add an `InstructionPass` global
+* implement the `simplify` function in conformance to `SILCombineSimplifyable`
 * register the pass in `registerSwiftPasses()`
 * if this pass replaces an existing `SILCombiner` visit function, remove the old visit function