Merge branch 'main' into rdar137710901-utf8view-span-notsmol

Author: glessard

.github/CODEOWNERS

@@ -78,7 +78,7 @@
 /include/swift/AST/*Requirement*                   @hborla @slavapestov
 /include/swift/AST/*Substitution*                  @slavapestov
 /include/swift/AST/DiagnosticGroup*                @DougGregor
-/include/swift/AST/DiagnosticsClangImporter.def    @zoecarver @hyp @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @fahadnayyar
+/include/swift/AST/DiagnosticsClangImporter.def    @zoecarver @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @fahadnayyar @susmonteiro
 /include/swift/AST/DiagnosticsDriver.def           @artemcm
 /include/swift/AST/DiagnosticsFrontend.def         @artemcm @tshortli
 /include/swift/AST/DiagnosticsIDE.def              @ahoppen @bnbarham @hamishknight @rintaro
@@ -90,7 +90,7 @@
 /include/swift/AST/Evaluator*                      @CodaFi @slavapestov
 /include/swift/Basic/                              @DougGregor
 /include/swift/Basic/Features.def                  @DougGregor @hborla
-/include/swift/ClangImporter                       @zoecarver @hyp @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @fahadnayyar
+/include/swift/ClangImporter                       @zoecarver @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @fahadnayyar @susmonteiro
 /include/swift/DependencyScan                      @artemcm @cachemeifyoucan
 /include/swift/Driver*/                            @artemcm
 /include/swift/Frontend*/                          @artemcm @tshortli
@@ -101,7 +101,7 @@
 /include/swift/Migrator/                           @nkcsgexi
 /include/swift/Option/*Options*                    @tshortli
 /include/swift/Parse/                              @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
-/include/swift/PrintAsClang                        @zoecarver @hyp @egorzhdan @Xazax-hun @j-hui @fahadnayyar
+/include/swift/PrintAsClang                        @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro
 /include/swift/Refactoring                         @ahoppen @bnbarham @hamishknight @rintaro
 /include/swift/Runtime/                            @rjmccall
 /include/swift/SIL/                                @jckarter
@@ -136,7 +136,7 @@
 /lib/ASTGen/                                        @ahoppen @bnbarham @CodaFi @hamishknight @rintaro
 /lib/Basic/                                         @DougGregor
 /lib/Basic/Windows                                  @compnerd
-/lib/ClangImporter                                  @zoecarver @hyp @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @fahadnayyar
+/lib/ClangImporter                                  @zoecarver @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @fahadnayyar @susmonteiro
 /lib/ClangImporter/DWARFImporter*                   @adrian-prantl
 /lib/DependencyScan                                 @artemcm @cachemeifyoucan
 /lib/Driver*/                                       @artemcm
@@ -155,7 +155,7 @@
 /lib/Markup/                                        @nkcsgexi
 /lib/Migrator/                                      @nkcsgexi
 /lib/Parse/                                         @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
-/lib/PrintAsClang                                   @zoecarver @hyp @egorzhdan @Xazax-hun @j-hui @fahadnayyar
+/lib/PrintAsClang                                   @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro
 /lib/Refactoring/                                   @ahoppen @bnbarham @hamishknight @rintaro
 /lib/SIL/                                           @jckarter
 /lib/SIL/**/*DebugInfo*                             @adrian-prantl
@@ -197,7 +197,7 @@
 /stdlib/private/SwiftReflectionTest/      @slavapestov
 /stdlib/public/*Demangl*/                 @rjmccall
 /stdlib/public/Concurrency/               @ktoso
-/stdlib/public/Cxx/                       @zoecarver @hyp @egorzhdan @Xazax-hun @j-hui @fahadnayyar
+/stdlib/public/Cxx/                       @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro
 /stdlib/public/Distributed/               @ktoso
 /stdlib/public/Observation/               @phausler
 /stdlib/public/RuntimeModule/             @al45tair @mikeash
@@ -223,7 +223,7 @@
 /test/IDE/                                          @ahoppen @bnbarham @hamishknight @rintaro
 /test/IRGen/                                        @rjmccall
 /test/Index/                                        @ahoppen @bnbarham @hamishknight @rintaro
-/test/Interop/                                      @zoecarver @hyp @egorzhdan @Xazax-hun @j-hui @fahadnayyar
+/test/Interop/                                      @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro
 /test/Migrator/                                     @nkcsgexi
 /test/Parse/                                        @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
 /test/Profiler                                      @ahoppen @bnbarham @hamishknight @rintaro

Runtimes/Core/Concurrency/CMakeLists.txt

@@ -115,10 +115,7 @@ target_link_libraries(swift_Concurrency PRIVATE
   $<$<PLATFORM_ID:Windows>:Synchronization>
   $<$<PLATFORM_ID:Windows>:mincore>
   # Link to the runtime that we are just building.
-  swiftCore
-  $<$<NOT:$<PLATFORM_ID:Darwin>>:swiftrt>)
-target_link_options(swift_Concurrency PRIVATE
-  -nostartfiles)
+  swiftCore)
 set_target_properties(swift_Concurrency PROPERTIES
   Swift_MODULE_NAME _Concurrency)
 

Runtimes/Core/Concurrency/InternalShims/CMakeLists.txt

@@ -1,3 +1,8 @@
 add_library(swiftConcurrencyInternalShims INTERFACE)
 target_include_directories(swiftConcurrencyInternalShims INTERFACE
-  ${CMAKE_CURRENT_SOURCE_DIR})
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+
+install(TARGETS swiftConcurrencyInternalShims
+  EXPORT SwiftCoreTargets
+  COMPONENT SwiftCore_runtime)
+

Runtimes/Core/cmake/caches/sccache.cmake

@@ -0,0 +1,7 @@
+find_program(SCCACHE_EXECUTABLE sccache)
+
+if(SCCACHE_EXECUTABLE)
+  set(CMAKE_C_COMPILER_LAUNCHER "${SCCACHE_EXECUTABLE}" CACHE FILEPATH "")
+  set(CMAKE_CXX_COMPILER_LAUNCHER "${SCCACHE_EXECUTABLE}" CACHE FILEPATH "")
+  message(STATUS "sccache enabled")
+endif()

Runtimes/Core/cmake/interface/SwiftCoreConfig.cmake.in

@@ -1,5 +1,5 @@
 @PACKAGE_INIT@
-include("${CMAKE_CURRENT_LIST_DIR}/SwiftCoreTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/SwiftCore/SwiftCoreTargets.cmake")
 
 set(SwiftCore_ENABLE_LIBRARY_EVOLUTION @SwiftCore_ENABLE_LIBRARY_EVOLUTION@)
 

Runtimes/Core/cmake/modules/DefaultSettings.cmake

@@ -62,10 +62,11 @@ elseif(LINUX OR ANDROID OR BSD)
   set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "dispatch")
 elseif(WIN32)
   set(SwiftCore_OBJECT_FORMAT_default "coff")
-  set(SwiftCore_THREADING_PACKAGE_default "WIN32")
+  set(SwiftCore_ENABLE_REFLECTION_default ON)
   set(SwiftCore_ENABLE_FATALERROR_BACKTRACE_default ON)
-  set(SwiftCore_ENABLE_PRESPECIALIZATION_default ON)
   set(SwiftCore_ENABLE_CONCURRENCY_default NO)
+  set(SwiftCore_THREADING_PACKAGE_default "WIN32")
+  set(SwiftCore_ENABLE_PRESPECIALIZATION_default ON)
   set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "dispatch")
 endif()
 

Runtimes/Core/cmake/modules/ExperimentalFeatures.cmake

@@ -10,5 +10,4 @@ add_compile_options(
   "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature FreestandingMacros>"
   "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature BitwiseCopyable>"
   "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature Extern>"
-  "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature ValueGenerics>"
-  "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature AddressableParameters>")
+  "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature ValueGenerics>")

Runtimes/Core/core/CMakeLists.txt

@@ -72,6 +72,7 @@ add_library(swiftCore
   DropWhile.swift
   Dump.swift
   EmptyCollection.swift
+  EnumeratedSequence.swift
   Equatable.swift
   ErrorType.swift
   ExistentialCollection.swift
@@ -278,6 +279,8 @@ target_compile_options(swiftCore PRIVATE
   # STAGING: Temporarily avoids having to write #fileID in Swift.swiftinterface.
   # see also 327ea8bce2d1107a847d444651b19ca6a2901c9e
   "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -enable-experimental-concise-pound-file>"
+  "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature AddressableParameters>"
+  "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature AddressableTypes>"
   $<$<COMPILE_LANGUAGE:Swift>:-parse-stdlib>
   $<$<COMPILE_LANGUAGE:Swift>:-nostdimport>
   $<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>
@@ -312,8 +315,16 @@ target_link_libraries(swiftCore
     $<$<NOT:$<PLATFORM_ID:Darwin>>:swiftrt$<$<PLATFORM_ID:Windows>:T>>
   PUBLIC
     swiftShims)
-target_link_options(swiftCore PRIVATE
-  -nostartfiles)
+target_link_options(swiftCore PUBLIC
+  $<$<LINK_LANGUAGE:Swift>:-nostartfiles>)
+string(TOLOWER "${SwiftCore_OBJECT_FORMAT}" SwiftCore_OBJECT_FORMAT_lc)
+if("${SwiftCore_OBJECT_FORMAT_lc}" STREQUAL "elf")
+  target_link_libraries(swiftCore INTERFACE
+    swiftrt$<$<BOOL:NO>:>)
+elseif("${SwiftCore_OBJECT_FORMAT_lc}" STREQUAL "coff")
+  target_link_libraries(swiftCore INTERFACE
+    swiftrt$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:T>)
+endif()
 if(NOT POLICY CMP0157)
   target_compile_options(swiftCore PRIVATE
     $<TARGET_OBJECTS:swiftRuntime>

Runtimes/Core/runtime/CMakeLists.txt

@@ -173,6 +173,7 @@ elseif("${SwiftCore_OBJECT_FORMAT}" STREQUAL "coffx")
     SWIFT_STATIC_STDLIB)
   target_link_libraries(swiftrtT PRIVATE swiftShims)
   install(FILES $<TARGET_OBJECTS:swiftrtT>
+    COMPONENT SwiftCore_runtime
     DESTINATION "${CMAKE_INSTALL_LIBDIR}/swift/${SwiftCore_PLATFORM_SUBDIR}/${SwiftCore_ARCH_SUBDIR}"
     RENAME swiftrtT.obj)
 

Runtimes/Overlay/CMakeLists.txt

@@ -0,0 +1,52 @@
+
+cmake_minimum_required(VERSION 3.26...3.29)
+
+set(CMAKE_C_VISIBILITY_PRESET "hidden")
+set(CMAKE_CXX_VISIBILITY_PRESET "hidden")
+set(CMAKE_VISIBILITY_INLINES_HIDDEN YES)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
+
+# NOTE: always use the 3-component style as the expansion as
+# `${PROJECT_VERSION}` will not extend this to the complete form and this can
+# change the behaviour for comparison with non-SemVer compliant parsing. If
+# possible, use the 4-version component as that is used to differentiate the
+# builds of the runtime for Windows.
+if($ENV{BUILD_NUMBER})
+  # NOTE: SxS modules have a limit on each component being [0-65535].
+  # https://learn.microsoft.com/en-us/windows/win32/sbscs/assembly-versions
+  math(EXPR BUILD_NUMBER "$ENV{BUILD_NUMBER} % 65535")
+  set(BUILD_NUMBER ".${BUILD_NUMBER}")
+endif()
+project(SwiftOverlay
+  LANGUAGES C CXX Swift
+  VERSION 6.1.0${BUILD_NUMBER})
+
+# FIXME: We should not need to refer back into the compiler sources. This is
+# needed by gyb and AvailabilityMacros
+set(SwiftOverlay_SWIFTC_SOURCE_DIR
+  "${PROJECT_SOURCE_DIR}/../../"
+  CACHE FILEPATH "Path to the root source directory of the Swift compiler")
+
+include(GNUInstallDirs)
+
+include(gyb)
+include(AvailabilityMacros)
+include(DefaultSettings)
+include(EmitSwiftInterface)
+include(PlatformInfo)
+include(ResourceEmbedding)
+
+defaulted_option(SwiftOverlay_ENABLE_REFLECTION "Enable runtime support for mirrors and reflection support")
+
+option(SwiftOverlay_INSTALL_NESTED_SUBDIR "Install libraries under a platform and architecture subdirectory" ON)
+set(SwiftOverlay_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>$<$<BOOL:${SwiftOverlay_INSTALL_NESTED_SUBDIR}>:/${SwiftOverlay_PLATFORM_SUBDIR}/${SwiftOverlay_ARCH_SUBDIR}>")
+set(SwiftOverlay_INSTALL_SWIFTMODULEDIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>$<$<BOOL:${SwiftOverlay_INSTALL_NESTED_SUBDIR}>:/${SwiftOverlay_PLATFORM_SUBDIR}>")
+
+add_compile_options(
+  "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-implicit-concurrency-module-import>"
+  "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-implicit-string-processing-module-import>")
+
+if(WIN32)
+  add_subdirectory(Windows)
+endif()

Runtimes/Overlay/Windows/CMakeLists.txt

@@ -0,0 +1,4 @@
+
+add_subdirectory(clang)
+add_subdirectory(CRT)
+add_subdirectory(WinSDK)

Runtimes/Overlay/Windows/CRT/CMakeLists.txt

@@ -0,0 +1,24 @@
+
+gyb_expand(tgmath.swift.gyb tgmath.swift)
+
+add_library(swiftCRT
+  tgmath.swift
+  ucrt.swift
+  Platform.swift
+  POSIXError.swift
+  TiocConstants.swift)
+set_target_properties(swiftCRT PROPERTIES
+  Swift_MODULE_NAME CRT)
+target_compile_definitions(swiftCRT PRIVATE
+  $<$<BOOL:${SwiftOverlay_ENABLE_REFLECTION}>:SWIFT_ENABLE_REFLECTION>)
+target_compile_options(swiftCRT PRIVATE
+  "SHELL:-Xcc -D_USE_MATH_DEFINES")
+
+install(TARGETS swiftCRT
+  ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+emit_swift_interface(swiftCRT)
+install_swift_interface(swiftCRT)
+
+embed_manifest(swiftCRT)

Runtimes/Overlay/Windows/WinSDK/CMakeLists.txt

@@ -0,0 +1,16 @@
+
+add_library(swiftWinSDK
+  WinSDK.swift)
+set_target_properties(swiftWinSDK PROPERTIES
+  Swift_MODULE_NAME WinSDK)
+target_compile_definitions(swiftCRT PRIVATE
+  $<$<BOOL:${SwiftOverlay_ENABLE_REFLECTION}>:SWIFT_ENABLE_REFLECTION>)
+
+install(TARGETS swiftWinSDK
+  ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+emit_swift_interface(swiftWinSDK)
+install_swift_interface(swiftWinSDK)
+
+embed_manifest(swiftWinSDK)

Runtimes/Overlay/Windows/clang/CMakeLists.txt

@@ -0,0 +1,7 @@
+
+install(FILES
+  ucrt.modulemap
+  vcruntime.apinotes
+  vcruntime.modulemap
+  winsdk.modulemap
+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})

Runtimes/Overlay/cmake/modules/AvailabilityMacros.cmake

@@ -0,0 +1,5 @@
+file(STRINGS "${SwiftOverlay_SWIFTC_SOURCE_DIR}/utils/availability-macros.def" availability_defs)
+list(FILTER availability_defs EXCLUDE REGEX "^\\s*(#.*)?$")
+foreach(def ${availability_defs})
+  add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -define-availability -Xfrontend \"${def}\">")
+endforeach()

Runtimes/Overlay/cmake/modules/DefaultSettings.cmake

@@ -0,0 +1,37 @@
+# This file is designed to setup reasonable defaults for the various settings so
+# that configuring a build for a given platform is likely to build
+# out-of-the-box without customization. This does not mean that it is the only
+# way that will work, or that it represents a shipping configuration.
+# User-specified configurations should be done through cache files or by setting
+# the variable with `-DSwiftOverlay_*` on the commandline.
+
+# Provide a boolean option that a user can optionally enable.
+# Variables are defaulted based on the value of `<variable>_default`.
+# If no such default variable exists, the option is defaults to `OFF`.
+macro(defaulted_option variable helptext)
+  if(NOT DEFINED ${variable}_default)
+    set(${variable}_default OFF)
+  endif()
+  option(${variable} ${helptext} ${${variable}_default})
+endmacro()
+
+# Create a defaulted cache entry
+# Entries are defaulted on the value of `<variable>_default`.
+# If no such default variable exists, the variable is not created.
+macro(defaulted_set variable type helptext)
+  if(DEFINED ${variable}_default)
+    set(${variable} ${${variable}_default} CACHE ${type} ${helptext})
+  endif()
+endmacro()
+
+if(APPLE)
+  set(SwiftOverlay_ENABLE_REFLECTION_default ON)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "WASM")
+  set(SwiftOverlay_ENABLE_REFLECTION_default OFF)
+elseif(LINUX OR ANDROID OR BSD)
+  set(SwiftOverlay_ENABLE_REFLECTION_default OFF)
+elseif(WIN32)
+  set(SwiftOverlay_ENABLE_REFLECTION_default OFF)
+endif()
+
+include("${SwiftOverlay_VENDOR_MODULE_DIR}/DefaultSettings.cmake" OPTIONAL)

Runtimes/Overlay/cmake/modules/EmitSwiftInterface.cmake

@@ -0,0 +1,68 @@
+# Generate and install swift interface files
+
+# TODO: CMake should learn how to model library evolution and generate this
+#       stuff automatically.
+
+
+# Generate a swift interface file for the target if library evolution is enabled
+function(emit_swift_interface target)
+  # Generate the target-variant binary swift module when performing zippered
+  # build
+  if(SwiftOverlay_VARIANT_MODULE_TRIPLE)
+    set(variant_module_tmp_dir "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}")
+    file(MAKE_DIRECTORY "${variant_module_tmp_dir}")
+    target_compile_options(${target} PRIVATE
+      "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-module-path ${variant_module_tmp_dir}/${target}.swiftmodule>")
+  endif()
+
+  # Generate textual swift interfaces is library-evolution is enabled
+  if(SwiftOverlay_ENABLE_LIBRARY_EVOLUTION)
+    target_compile_options(${target} PRIVATE
+      $<$<COMPILE_LANGUAGE:Swift>:-emit-module-interface-path$<SEMICOLON>${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftinterface>
+      $<$<COMPILE_LANGUAGE:Swift>:-emit-private-module-interface-path$<SEMICOLON>${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.private.swiftinterface>
+      $<$<COMPILE_LANGUAGE:Swift>:-library-level$<SEMICOLON>api>
+      $<$<COMPILE_LANGUAGE:Swift>:-Xfrontend$<SEMICOLON>-require-explicit-availability=ignore>)
+
+      # Emit catalyst swiftmodules and interfaces
+      if(SwiftOverlay_VARIANT_MODULE_TRIPLE)
+        target_compile_options(${target} PRIVATE
+          "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-module-interface-path ${variant_module_tmp_dir}/${target}.swiftinterface>"
+          "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-private-module-interface-path ${variant_module_tmp_dir}/${target}.private.swiftinterface>")
+      endif()
+  endif()
+endfunction()
+
+# Install the generated swift interface file for the target if library evolution
+# is enabled.
+function(install_swift_interface target)
+  # Install binary swift modules
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
+    RENAME "${SwiftOverlay_MODULE_TRIPLE}.swiftmodule"
+    DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
+  if(SwiftOverlay_VARIANT_MODULE_TRIPLE)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}/${target}.swiftmodule"
+      RENAME "${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftmodule"
+      DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
+  endif()
+
+  # Install Swift interfaces if library-evolution is enabled
+  if(SwiftOverlay_ENABLE_LIBRARY_EVOLUTION)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftinterface"
+      RENAME "${SwiftOverlay_MODULE_TRIPLE}.swiftinterface"
+      DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
+
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.private.swiftinterface"
+      RENAME "${SwiftOverlay_MODULE_TRIPLE}.private.swiftinterface"
+      DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
+
+    # Install catalyst interface files
+    if(SwiftOverlay_VARIANT_MODULE_TRIPLE)
+      install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}/${target}.swiftinterface"
+        RENAME "${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftinterface"
+        DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
+      install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}/${target}.private.swiftinterface"
+        RENAME "${SwiftOverlay_VARIANT_MODULE_TRIPLE}.private.swiftinterface"
+        DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
+    endif()
+  endif()
+endfunction()