Merge branch 'swiftlang:main' into eng/statics-const-extract

Author: jPaolantonio

CMakeLists.txt

@@ -463,6 +463,10 @@ option(SWIFT_STDLIB_ENABLE_SIB_TARGETS
        "Should we generate sib targets for the stdlib or not?"
        FALSE)
 
+option(SWIFT_STDLIB_BUILD_SYMBOL_GRAPHS
+       "Whether to build symbol graphs for the stdlib, for use in documentation."
+       FALSE)
+
 
 set(SWIFT_DARWIN_SUPPORTED_ARCHS "" CACHE STRING
   "Semicolon-separated list of architectures to configure on Darwin platforms. \

README.md

@@ -13,7 +13,8 @@
 | **Ubuntu 20.04** | AArch64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04-aarch64/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04-aarch64)|
 | **Ubuntu 22.04** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04)|
 | **Ubuntu 22.04** | AArch64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04-aarch64/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04-aarch64)|
-| **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)|
+| **Ubuntu 24.04** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-24_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-24_04)|
+| **Ubuntu 24.04** | AArch64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-24_04-aarch64/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-24_04-aarch64)|
 | **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)|

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/ComputeSideEffects.swift

@@ -57,6 +57,7 @@ let computeSideEffects = FunctionPass(name: "compute-side-effects") {
   // instruction the argument might have escaped.
   for argument in function.arguments {
     collectedEffects.addEffectsForEscapingArgument(argument: argument)
+    collectedEffects.addEffectsForConsumingArgument(argument: argument)
   }
 
   // Don't modify the effects if they didn't change. This avoids sending a change notification
@@ -236,7 +237,17 @@ private struct CollectedEffects {
       addEffects(.destroy, to: argument)
     }
   }
-  
+
+  mutating func addEffectsForConsumingArgument(argument: FunctionArgument) {
+    if argument.convention == .indirectIn {
+      // Usually there _must_ be a read from a consuming in-argument, because the function has to consume the argument.
+      // But in the special case if all control paths end up in an `unreachable`, the consuming read might have been
+      // dead-code eliminated. Therefore make sure to add the read-effect in any case. Otherwise it can result
+      // in memory lifetime failures at a call site.
+      addEffects(.read, to: argument)
+    }
+  }
+
   private mutating func handleApply(_ apply: ApplySite) {
     let callees = calleeAnalysis.getCallees(callee: apply.callee)
     let args = apply.argumentOperands.lazy.map {

benchmark/Package.swift

@@ -127,8 +127,7 @@ targets.append(
     dependencies: swiftBenchDeps,
     path: "utils",
     sources: ["main.swift"],
-    swiftSettings: [.unsafeFlags(["-Xfrontend",
-                                  "-enable-experimental-cxx-interop",
+    swiftSettings: [.unsafeFlags(["-cxx-interoperability-mode=default",
                                   "-I",
                                   "utils/CxxTests"])]))
 
@@ -166,8 +165,7 @@ targets += cxxSingleSourceLibraries.map { name in
     dependencies: singleSourceDeps,
     path: "cxx-source",
     sources: ["\(name).swift"],
-    swiftSettings: [.unsafeFlags(["-Xfrontend",
-                                  "-enable-experimental-cxx-interop",
+    swiftSettings: [.unsafeFlags(["-cxx-interoperability-mode=default",
                                   "-I",
                                   "utils/CxxTests",
                                   // FIXME: https://github.com/apple/swift/issues/61453

cmake/modules/AddPureSwift.cmake

@@ -120,6 +120,31 @@ function(_set_pure_swift_profile_flags target_name)
   endif()
 endfunction()
 
+function(_set_pure_swift_package_options target_name package_name)
+  if(NOT package_name OR NOT Swift_COMPILER_PACKAGE_CMO_SUPPORT)
+    return()
+  endif()
+
+  # Enable package CMO if possible.
+  # NOTE: '-enable-library-evolution' is required for package CMO even when we
+  # don't need '.swiftinterface'. E.g. executables.
+  if(Swift_COMPILER_PACKAGE_CMO_SUPPORT STREQUAL "IMPLEMENTED")
+    target_compile_options("${target_name}" PRIVATE
+      "-enable-library-evolution"
+      "SHELL:-package-name ${package_name}"
+      "SHELL:-Xfrontend -package-cmo"
+      "SHELL:-Xfrontend -allow-non-resilient-access"
+    )
+  elseif(Swift_COMPILER_PACKAGE_CMO_SUPPORT STREQUAL "EXPERIMENTAL")
+    target_compile_options("${target_name}" PRIVATE
+      "-enable-library-evolution"
+      "SHELL:-package-name ${package_name}"
+      "SHELL:-Xfrontend -experimental-package-cmo"
+      "SHELL:-Xfrontend -experimental-allow-non-resilient-access"
+      "SHELL:-Xfrontend -experimental-package-bypass-resilience"
+    )
+  endif()
+endfunction()
 
 # Add a new "pure" Swift host library.
 #
@@ -149,6 +174,9 @@ endfunction()
 # EMIT_MODULE
 #   Emit '.swiftmodule' to
 #
+# PACKAGE_NAME
+#   Name of the Swift package this library belongs to.
+#
 # DEPENDENCIES
 #   Target names to pass target_link_library
 #
@@ -169,7 +197,8 @@ function(add_pure_swift_host_library name)
         SHARED
         STATIC
         EMIT_MODULE)
-  set(single_parameter_options)
+  set(single_parameter_options
+        PACKAGE_NAME)
   set(multiple_parameter_options
         DEPENDENCIES
         SWIFT_DEPENDENCIES)
@@ -193,6 +222,7 @@ function(add_pure_swift_host_library name)
   # Create the library.
   add_library(${name} ${libkind} ${APSHL_SOURCES})
   _add_host_swift_compile_options(${name})
+  _set_pure_swift_package_options(${name} "${APSHL_PACKAGE_NAME}")
 
   set_property(TARGET ${name}
     PROPERTY BUILD_WITH_INSTALL_RPATH YES)
@@ -315,6 +345,9 @@ endfunction()
 # name
 #   Name of the tool (e.g., swift-frontend).
 #
+# PACKAGE_NAME
+#   Name of the Swift package this executable belongs to.
+#
 # DEPENDENCIES
 #   Target names to pass target_link_library
 #
@@ -333,7 +366,8 @@ function(add_pure_swift_host_tool name)
   # Option handling
   set(options)
   set(single_parameter_options
-    SWIFT_COMPONENT)
+    SWIFT_COMPONENT
+    PACKAGE_NAME)
   set(multiple_parameter_options
         DEPENDENCIES
         SWIFT_DEPENDENCIES)
@@ -349,6 +383,7 @@ function(add_pure_swift_host_tool name)
   add_executable(${name} ${APSHT_SOURCES})
   _add_host_swift_compile_options(${name})
   _set_pure_swift_link_flags(${name} "../lib/")
+  _set_pure_swift_package_options(${name} "${APSHT_PACKAGE_NAME}")
 
   if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
     set_property(TARGET ${name}

cmake/modules/macCatalystUtils.cmake

@@ -78,7 +78,7 @@ function(get_target_triple target_out_var target_variant_out_var sdk arch)
   elseif(maccatalyst_build_flavor STREQUAL "macos-like")
     # Use the default macOS triple.
   elseif(maccatalyst_build_flavor STREQUAL "zippered")
-    set(target "${arch}-apple-macosx${SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX}")
+    set(target "${arch}-apple-macosx${deployment_version}")
     set(target_variant "${arch}-apple-ios${SWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST}-macabi")
   elseif(maccatalyst_build_flavor STREQUAL "unzippered-twin")
     # Use the default triple for now

docs/ABI/Mangling.rst

@@ -1265,14 +1265,17 @@ Function Specializations
 
 ::
 
-  specialization ::= type '_' type* 'Tg' SPEC-INFO     // Generic re-abstracted specialization
-  specialization ::= type '_' type* 'TB' SPEC-INFO     // Alternative mangling for generic re-abstracted specializations,
-                                                       // used for functions with re-abstracted resilient parameter types.
+  specialization ::= type '_' type* 'T' dropped-arg* 'g' SPEC-INFO  // Generic re-abstracted specialization
+  specialization ::= type '_' type* 'T' dropped-arg* 'B' SPEC-INFO  // Alternative mangling for generic re-abstracted specializations,
+                                                                    // used for functions with re-abstracted resilient parameter types.
+  specialization ::= type '_' type* 'T' dropped-arg* 'G' SPEC-INFO  // Generic not re-abstracted specialization
   specialization ::= type '_' type* 'Ts' SPEC-INFO     // Generic re-abstracted prespecialization
-  specialization ::= type '_' type* 'TG' SPEC-INFO     // Generic not re-abstracted specialization
   specialization ::= type '_' type* 'Ti' SPEC-INFO     // Inlined function with generic substitutions.
   specialization ::= type '_' type* 'Ta' SPEC-INFO     // Non-async specialization
 
+  dropped-arg ::= 't'                                  // The first argument is dropped
+  dropped-arg ::= 't' NATURAL                          // The `N+1`th argument is dropped
+
 The types are the replacement types of the substitution list.
 
 ::
@@ -1294,7 +1297,7 @@ Some kinds need arguments, which precede ``Tf``.
   spec-arg ::= identifier
   spec-arg ::= type
 
-  SPEC-INFO ::= MT-REMOVED? FRAGILE? ASYNC-REMOVED? PASSID
+  SPEC-INFO ::= FRAGILE? ASYNC-REMOVED? PASSID
 
   PASSID ::= '0'                             // AllocBoxToStack,
   PASSID ::= '1'                             // ClosureSpecializer,
@@ -1305,8 +1308,6 @@ Some kinds need arguments, which precede ``Tf``.
   PASSID ::= '6'                             // MoveDiagnosticInOutToOut,
   PASSID ::= '7'                             // AsyncDemotion,
 
-  MT-REMOVED ::= 'm'                         // non-generic metatype arguments are removed in the specialized function
-
   FRAGILE ::= 'q'
 
   ASYNC-REMOVED ::= 'a'                      // async effect removed

docs/EmbeddedSwift/UserManual.md

@@ -100,7 +100,7 @@ Segment __TEXT: 16384
 
 ## Strings
 
-Both StaticString and String types are available in Embedded Swift. As is the case in desktop Swift, certain operations on strings require Unicode data tables for strict Unicode compliance. In Embedded Swift. these data tables are provided as a separate static library (libUnicodeDataTables.a) that users need to link in manually – if they need to use these string operations. If the library is required, linking will fail due to missing on one or more of the following symbols:
+Both StaticString and String types are available in Embedded Swift. As is the case in desktop Swift, certain operations on strings require Unicode data tables for strict Unicode compliance. In Embedded Swift these data tables are provided as a separate static library (libUnicodeDataTables.a) that users need to link in manually – if they need to use these string operations. If the library is required, linking will fail due to missing on one or more of the following symbols:
 
 ```
 _swift_stdlib_getAge

docs/Generics/README.md

@@ -0,0 +1,83 @@
+# Compiling Swift Generics
+
+This is a book about the *implementation* of generic programming--also known as parametric polymorphism--in the Swift compiler. The first four chapters also give an overview of the Swift compiler architecture in general.
+
+## Downloading the PDF
+
+A periodically-updated PDF is available here:
+
+> https://download.swift.org/docs/assets/generics.pdf
+
+## Typesetting the PDF
+
+It's written in TeX, so to typeset the PDF yourself, you need a TeX distribution:
+
+- [MacTeX](https://www.tug.org/mactex/mactex-download.html): macOS
+- [TeX Live](https://www.tug.org/texlive/): Linux, Windows
+- [MikTeX](https://miktex.org): another alternative for macOS, Linux, Windows
+
+### Using `make`
+
+Running `make` in `docs/Generics/` will run `pdflatex` and `bibtex` in the right order to generate the final document with bibliography, index and cross-references:
+
+```
+cd docs/Generics/
+make
+```
+
+### Using `latexmk`
+
+A more modern alternative is to use `latexmk`, which runs `pdflatex` and `bibtex` until fixed point:
+
+```
+cd docs/Generics/
+latexmk -pdf generics.tex
+```
+
+### Manually
+
+You can also just do this:
+
+```
+cd docs/Generics/
+pdflatex generics
+bibtex generics
+pdflatex generics
+pdflatex generics
+```
+
+## Reading the PDF
+
+The book makes use of internal hyperlinks so it is is best to use PDF reader with support for PDF bookmarks and back/forward history:
+
+- Preview.app on macOS fits the bill; you can add Back/Forward buttons to the toolbar with **View** > **Customize Toolbar**.
+- [Skim.app](https://skim-app.sourceforge.io) is a BSD-licensed open source PDF reader for macOS.
+
+The font size and link targets are probably too small for a smartphone display, so I recommend using something bigger.
+
+## Current Status
+
+This is a work in progress.
+
+The following chapters need some editing:
+
+- Part II:
+  - Substitution Maps
+  - Conformances
+- Part III:
+  - Conformance Paths
+- Part V:
+  - Symbols, Terms, and Rules
+  - Completion
+- Type Substitution Summary
+
+The following chapters are not yet written:
+
+- Part IV:
+  - Opaque Return Types
+  - Existential Types
+  - Subclassing
+- Part V:
+  - The Property Map
+  - Concrete Conformances
+  - Rule Minimization

docs/Generics/chapters/archetypes.tex

@@ -155,16 +155,16 @@ \section{Local Requirements}\label{local requirements}
 Recall that with a type parameter, global conformance lookup returns an abstract conformance without being able to check if the conformance actually holds (\SecRef{abstract conformances}). With archetypes, we implement a more useful behavior that distinguishes several cases. Let $\archetype{T}$ be an archetype with generic signature $G$, and let \texttt{P} be a protocol:
 \begin{enumerate}
 \item If $G\vdash\TC$ for some class type~\texttt{C}, and \texttt{C} conforms to \texttt{P}, then the archetype \emph{conforms concretely} to \texttt{P}. The class type \texttt{C} may contain type parameters, so global conformance lookup recursively calls itself on~$\MapIn(\texttt{C})$:
-\[\protosym{P}\otimes\archetype{T}=\protosym{P}\otimes\MapIn(\texttt{C})=\ConfReq{$\MapIn(\texttt{C})$}{P}\]
+\[\pP \otimes \archetype{T}=\pP \otimes \MapIn(\texttt{C})=\ConfReq{$\MapIn(\texttt{C})$}{P}\]
 The result is actually wrapped in an \index{inherited conformance}\emph{inherited conformance}, which doesn't do much except report the conforming type as $\archetype{T}$ rather than $\MapIn(\texttt{C})$ (\SecRef{inheritedconformance}).
 \item If $G\vdash\TP$, the archetype \emph{conforms abstractly}, and thus global conformance lookup returns an abstract conformance:
-\[\protosym{P}\otimes\archetype{T}=\ConfReq{$\archetype{T}$}{P}\]
+\[\pP\otimes\archetype{T}=\ConfReq{$\archetype{T}$}{P}\]
 \item Otherwise, $\archetype{T}$ does not conform to \texttt{P}, and global conformance lookup returns an invalid conformance.
 \end{enumerate}
 In (2), we return an abstract conformance whose subject type is an archetype. We need to explain what this means. To recap, when the original type of an abstract conformance is a type parameter~\tT, the type witness for \texttt{[P]A} is a dependent member type~\texttt{T.[P]A}. Similarly, the associated conformance for $\AssocConfReq{Self.U}{Q}{P}$ is the abstract conformance $\ConfReq{T.U}{Q}$. So, when the original type is an \index{abstract conformance!with archetype}archetype $\archetype{T}$, we must also map this \index{type witness!of abstract conformance}type witness or \index{associated conformance!of abstract conformance}associated conformance into the environment:
 \begin{align*}
 \AssocType{[P]A}\otimes \ConfReq{$\archetype{T}$}{P} &=\archetype{T.[P]A}= \MapIn(\texttt{T.[P]A})\\
-\AssocConf{Self.U}{Q}\otimes \ConfReq{$\archetype{T}$}{P} &=\ConfReq{$\archetype{T.U}$}{Q}= \protosym{Q}\otimes\MapIn(\texttt{T.U})
+\AssocConf{Self.U}{Q}\otimes \ConfReq{$\archetype{T}$}{P} &=\ConfReq{$\archetype{T.U}$}{Q}= \pQ\otimes\MapIn(\texttt{T.U})
 \end{align*}
 
 \section{Archetype Substitution}\label{archetypesubst}
@@ -173,7 +173,7 @@ \section{Archetype Substitution}\label{archetypesubst}
 \[
 \TypeObj{\EquivClass{G}}\otimes\SubMapObj{G}{H}\longrightarrow\TypeObj{H}
 \]
-To apply a substitution map $\Sigma$ to a contextual type $\tT^\prime\in\TypeObj{\EquivClass{G}}$, we first map the the contextual type out of its environment, and then apply the substitution map to this interface type:
+To apply a substitution map $\Sigma$ to a contextual type $\tT^\prime\in\TypeObj{\EquivClass{G}}$, we first map the contextual type out of its environment, and then apply the substitution map to this interface type:
 \[\tT^\prime\otimes \Sigma = \MapOut(\tT^\prime)\otimes \Sigma\]
 If the replacement types of $\Sigma$ are interface types, we always get an interface type back, regardless of whether the original type was an interface type or a contextual type.
 
@@ -415,7 +415,7 @@ \section{The Type Parameter Graph}\label{type parameter graph}
 \node (TA) [interior, right=of T] {\texttt{\rT.A}};
 \node (TAA) [interior, right=of TA] {\texttt{\rT.A.A}};
 \node (TAAA) [interior, right=of TAA] {\texttt{\rT.A.A.A}};
-\node (Rest) [interior, right=of TAAA] {\texttt{\vphantom{Ty}...}};
+\node (Rest) [right=of TAAA] {$\cdots$};
 
 \path [arrow] (T) edge [above] node {\tiny{\texttt{.A}}} (TA);
 \path [arrow] (TA) edge [above] node {\tiny{\texttt{.A}}} (TAA);
@@ -597,14 +597,14 @@ \section{The Archetype Builder}\label{archetype builder}
 \item If $\PAForward(t)$ is non-null, load $t\leftarrow\PAForward(t)$, and repeat if necessary.
 \item If $\texttt{P}\in\PAConforms(t)$, return.
 \item Otherwise, set $\PAConforms(t)\leftarrow \PAConforms(t)\cup\{\texttt{P}\}$.
-\item For each protocol~\texttt{Q} appearing in the inheritance clause of the declaration of \texttt{P}, recursively apply this algorithm to $t$ and \texttt{Q}.
+\item For each protocol~\tQ\ appearing in the inheritance clause of the declaration of \texttt{P}, recursively apply this algorithm to $t$ and \tQ.
 \item Let $\tT:=\PAType(t)$.
 \item For each associated type declaration \texttt{A} of \texttt{P}:
 \begin{enumerate}
 \item If $\PAMembers(t)$ does not have an entry for \texttt{A}, create a new potential archetype~$v$ with $\PAType(v)=\texttt{T.A}$. Add the ordered pair $(\texttt{A}, v)$ to $\PAMembers(t)$.
 
 Otherwise, $\PAMembers(t)$ contains an existing entry~$(\texttt{A}, v)$ with $\PAType(v)=\texttt{T.A}$.
-\item For each protocol $\texttt{Q}$ listed in the inheritance clause of the declaration of \texttt{A}, first check if \texttt{Q} already appears among the set of all protocols we've visited in prior recursive calls; if so, emit a diagnostic. Otherwise, add \texttt{Q} to the visited set, and recursively apply this algorithm to $v$ and \texttt{Q}.
+\item For each protocol \tQ\ listed in the inheritance clause of the declaration of \texttt{A}, first check if \tQ\ already appears among the set of all protocols we've visited in prior recursive calls; if so, emit a diagnostic. Otherwise, add \tQ\ to the visited set, and recursively apply this algorithm to $v$ and \tQ.
 \end{enumerate}
 \end{enumerate}
 \end{algorithm}