Merge branch 'main' into issue75776

Author: kovdan01

.github/CODEOWNERS

@@ -261,13 +261,15 @@
 
 # utils
 /utils/*windows*                                              @compnerd
+/utils/generate-xcode                                         @hamishknight
 /utils/gyb_sourcekit_support/                                 @ahoppen @bnbarham @hamishknight @rintaro
 /utils/sourcekit_fuzzer/                                      @ahoppen @bnbarham @hamishknight @rintaro
 /utils/swift_build_support/products/earlyswiftsyntax.py       @ahoppen @bnbarham @hamishknight @rintaro
 /utils/swift_build_support/products/skstresstester.py         @ahoppen @bnbarham @hamishknight @rintaro
 /utils/swift_build_support/products/sourcekitlsp.py           @ahoppen @bnbarham @hamishknight @rintaro
 /utils/swift_build_support/products/swiftformat.py            @ahoppen @allevato @bnbarham @hamishknight @rintaro
 /utils/swift_build_support/products/swiftsyntax.py            @ahoppen @bnbarham @hamishknight @rintaro
+/utils/swift-xcodegen/                                        @hamishknight
 /utils/update-checkout*                                       @shahmishal
 /utils/update_checkout/                                       @shahmishal
 /utils/vim/                                                   @compnerd

.gitignore

@@ -78,3 +78,20 @@ SortedCFDatabase.def
 htmlcov
 .coverage
 /benchmark/scripts/Benchmark_Driverc
+
+#==============================================================================#
+# Ignore copied Swift Stdlib files while migrating stdlib
+#==============================================================================#
+Runtimes/**/*.swift
+Runtimes/**/*.h
+Runtimes/**/*.cpp
+Runtimes/**/*.c
+Runtimes/**/*.m
+Runtimes/**/*.mm
+Runtimes/**/*.def
+Runtimes/**/*.gyb
+Runtimes/**/*.apinotes
+Runtimes/**/*.yaml
+Runtimes/**/*.inc
+Runtimes/**/*.json
+Runtimes/**/*.modulemap

CMakeLists.txt

@@ -747,6 +747,10 @@ option(SWIFT_ENABLE_EXPERIMENTAL_PARSER_VALIDATION
   "Enable experimental SwiftParser validation by default"
   FALSE)
 
+option(SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS
+  "Enable experimental safe wrappers around external functions"
+  FALSE)
+
 cmake_dependent_option(SWIFT_BUILD_SOURCEKIT
   "Build SourceKit" TRUE
   "SWIFT_ENABLE_DISPATCH" FALSE)
@@ -1399,6 +1403,7 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
   message(STATUS "Observation Support:                ${SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION}")
   message(STATUS "Synchronization Support:            ${SWIFT_ENABLE_SYNCHRONIZATION}")
   message(STATUS "Volatile Support:                   ${SWIFT_ENABLE_VOLATILE}")
+  message(STATUS "Pointer Bounds Support:             ${SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS}")
   message(STATUS "")
 else()
   message(STATUS "Not building Swift standard library, SDK overlays, and runtime")
@@ -1466,6 +1471,10 @@ if(SWIFT_ENABLE_DISPATCH)
 endif()
 
 # Add all of the subdirectories, where we actually do work.
+add_subdirectory(include)
+if(SWIFT_INCLUDE_TOOLS)
+  add_subdirectory(lib)
+endif()
 
 ###############
 # PLEASE READ #
@@ -1518,11 +1527,7 @@ if(SWIFT_INCLUDE_APINOTES)
   add_subdirectory(apinotes)
 endif()
 
-add_subdirectory(include)
-
 if(SWIFT_INCLUDE_TOOLS)
-  add_subdirectory(lib)
-
   add_subdirectory(SwiftCompilerSources)
 
   # Always include this after including stdlib/!
@@ -1579,3 +1584,48 @@ if(XCODE)
   add_custom_target(Miscellaneous
       SOURCES ${SWIFT_TOPLEVEL_HEADERS})
 endif()
+
+# New standard library build
+option(SWIFT_ENABLE_NEW_RUNTIME_BUILD "Build Swift runtimes with new build system" OFF)
+if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
+
+  add_custom_target(PopulateRuntimeSourceDir
+    COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_SOURCE_DIR}/Runtimes/Resync.cmake"
+    COMMENT "Copying sources into new runtime build")
+
+  foreach(sdk ${SWIFT_SDKS})
+    foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
+      # Provide a mechanism to skip building one of these runtimes
+      if(SWIFT_SKIP_${sdk}_${arch}_RUNTIME)
+        message(STATUS "Skipping: ${arch}-${sdk} runtime build")
+        continue()
+      endif()
+      set(stdlib_target "swift-stdlib-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
+      if(${SWIFT_SDK_${sdk}_${arch}_CACHE})
+        set(stdlib_cache_file_flag -C ${SWIFT_SDK_${sdk}_${arch}_CACHE})
+      endif()
+      ExternalProject_Add("${stdlib_target}-core"
+        SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Runtimes/Core"
+        # TODO: Add this once we're ready to start swapping out the libraries
+        #       for testing
+        # INSTALL_DIR "${CMAKE_BINARY_DIR}/"
+
+        DEPENDS PopulateRuntimeSourceDir
+        CMAKE_ARGS
+          -DCMAKE_INSTALL_LIBDIR:FILEPATH=lib/swift/${SWIFT_SDK_${sdk}_LIB_SUBDIR}/${arch}
+          # Compiler will see mismatched swift modules and fail initial checks
+          -DCMAKE_Swift_COMPILER_WORKS:BOOLEAN=YES
+          -DBUILD_SHARED_LIBS:BOOLEAN=YES # TODO: Make this configurable
+          ${stdlib_cache_file_flag}
+          -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+          -DCMAKE_INSTALL_PREFIX:FILEPATH=<INSTALL_DIR>
+          -DCMAKE_Swift_COMPILER:FILEPATH=$<IF:$<BOOL:${CMAKE_CROSSCOMPILING}>,${CMAKE_Swift_COMPILER},$<PATH:REPLACE_FILENAME,$<TARGET_FILE:swift-frontend>,swiftc>>
+          -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+          -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
+          -DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS})
+      if(NOT ${CMAKE_CROSSCOMPILING})
+        add_dependencies("${stdlib_target}" swift-frontend)
+      endif()
+    endforeach()
+  endforeach()
+endif()

Runtimes/Core/CMakeLists.txt

@@ -0,0 +1,136 @@
+# Notes:
+#
+# The Demangling library uses `#if SWIFT_HAVE_CRASHREPORTERCLIENT` while the
+# runtime library uses `#ifdef SWIFT_HAVE_CRASHREPORTERCLIENT` to toggle that
+# functionality. When building the demangling library, the macro should be set
+# to 0 or 1 to indicate the presence of the crashreporter.
+# When building the runtime library, the existence of the macro indicates the
+# presence of the crashreporter.
+#
+# Runtime library pulls sources and headers from compiler sources (ThreadSanitizer)
+# Demangling library pulls sources and headers from compiler sources (all)
+#
+#
+# gyb pulls sources from compiler sources
+#
+# Stubs:
+#   Pulls in headers from compiler
+#     - include/swift/Basic
+#     - include/swift/Runtime
+#     - include/swift/Threading
+
+# TODO:
+# Platform support:
+#   - Work on/Verify cross-compiling
+#   - Work on/Verify Windows and Linux native builds
+# Embedded
+#   -- -Xfrontend -emit-empty-object-file
+# Catalyst Support
+#   -- Will need shadow invocations to generate swiftmodules for Swift parts
+# Install *.abi.json, swiftdoc, and swiftsourceinfo
+# Pointer bounds (SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS)
+
+cmake_minimum_required(VERSION 3.26...3.29)
+
+set(CMAKE_C_VISIBILITY_PRESET "hidden")
+set(CMAKE_CXX_VISIBILITY_PRESET "hidden")
+
+set(SwiftCore_CMAKE_MODULES_DIR "${CMAKE_SOURCE_DIR}/cmake/modules")
+list(APPEND CMAKE_MODULE_PATH ${SwiftCore_CMAKE_MODULES_DIR})
+
+include(CMakeWorkarounds)
+project(SwiftCore LANGUAGES C CXX Swift VERSION 6.1)
+
+# The Swift standard library is not intended for use as a sub-library as part of
+# another project. It is tightly coupled with the compiler version.
+if(NOT PROJECT_IS_TOP_LEVEL)
+  message(FATAL_ERROR "Swift Core must build as a standalone project")
+endif()
+
+# FIXME: We should not need to refer back into the compiler sources. This is
+#        needed by gyb, Demangling, Threading, the runtime (ThreadSanitizer.cpp)
+set(SwiftCore_SWIFTC_SOURCE_DIR
+  "${PROJECT_SOURCE_DIR}/../../"
+  CACHE FILEPATH "Path to the root source directory of the Swift compiler")
+
+# Hook point for vendor-specific extensions to the build system
+# Allowed extension points:
+#   - DefaultSettings.cmake
+#   - Settings.cmake
+set(SwiftCore_VENDOR_MODULE_DIR "${SwiftCore_CMAKE_MODULES_DIR}/vendor"
+  CACHE FILEPATH "Location for private build system extension")
+
+include(GNUInstallDirs)
+include(AvailabilityMacros)
+include(CompilerSettings)
+include(DefaultSettings)
+include(EmitSwiftInterface)
+include(PlatformInfo)
+include(gyb)
+
+include("${SwiftCore_VENDOR_MODULE_DIR}/Settings.cmake" OPTIONAL)
+
+defaulted_option(SwiftCore_ENABLE_LIBRARY_EVOLUTION "Generate ABI resilient runtime libraries")
+
+defaulted_option(SwiftCore_ENABLE_CRASH_REPORTER_CLIENT "Enable Apple CrashReporter integration")
+defaulted_option(SwiftCore_ENABLE_OBJC_INTEROP "Enable runtime ObjC interop")
+defaulted_option(SwiftCore_ENABLE_TYPE_PRINTING "Enable printing type names")
+defaulted_option(SwiftCore_ENABLE_VECTOR_TYPES "Enable vector support")
+defaulted_option(SwiftCore_ENABLE_REFLECTION "Enable runtime support for mirrors and reflection support")
+defaulted_option(SwiftCore_ENABLE_COMMANDLINE_SUPPORT "Enable command line argument support")
+defaulted_option(SwiftCore_ENABLE_RUNTIME_FUNCTION_COUNTERS "Enable runtime function counter support")
+defaulted_option(SwiftCore_ENABLE_STDIN "Enable functions that use stdin support")
+defaulted_option(SwiftCore_ENABLE_ENVIRONMENT "Enable environment variable support")
+defaulted_option(SwiftCore_ENABLE_OVERRIDABLE_RETAIN_RELEASE "Enable override hooks for retain/release")
+defaulted_option(SwiftCore_ENABLE_MALLOC_TYPE "Enable malloc type information")
+defaulted_option(SwiftCore_ENABLE_RUNTIME_OS_VERSIONING "Enable runtime OS version detection")
+defaulted_option(SwiftCore_ENABLE_STATIC_PRINT "Disable full print")
+defaulted_option(SwiftCore_ENABLE_UNICODE_DATA "Embed Unicode info in Swift Core")
+defaulted_option(SwiftCore_ENABLE_COMPACT_ABSOLUTE_FUNCTION_POINTERS "Resolve absolute function pointer as identity")
+defaulted_option(SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT "Add symbols for runtime backdeployment")
+
+defaulted_option(SwiftCore_ENABLE_BACKTRACING "Enable backtracing runtime support")
+defaulted_set(SwiftCore_BACKTRACER_PATH STRING "Set a fixed path to the Swift backtracer")
+
+option(SwiftCore_ENABLE_CLOBBER_FREED_OBJECTS "" OFF)
+option(SwiftCore_ENABLE_RUNTIME_LEAK_CHECKER "" OFF)
+option(SwiftCore_ENABLE_INTERNAL_CHECKS "" OFF)
+
+defaulted_set(SwiftCore_OBJECT_FORMAT STRING "Object format: ELF COFF")
+
+# TODO: Most of these should be attached to specific targets rather than applied
+#       globally. They can be applied as part of the library interface if they
+#       affect the behavior of libraries that build against a given target.
+add_compile_definitions(
+  $<$<BOOL:${SwiftCore_ENABLE_OBJC_INTEROP}>:-DSWIFT_OBJC_INTEROP>
+  $<$<BOOL:${SwiftCore_ENABLE_LIBRARY_EVOLUTION}>:-DSWIFT_LIBRARY_EVOLUTION>
+  $<$<BOOL:${SwiftCore_ENABLE_CRASH_REPORTER_CLIENT}>:-DSWIFT_HAVE_CRASHREPORTERCLIENT>
+  $<$<BOOL:${SwiftCore_ENABLE_VECTOR_TYPES}>:-DSWIFT_STDLIB_ENABLE_VECTOR_TYPES>
+  $<$<BOOL:${SwiftCore_ENABLE_REFLECTION}>:-DSWIFT_ENABLE_REFLECTION>
+  $<$<BOOL:${SwiftCore_ENABLE_RUNTIME_FUNCTION_COUNTERS}>:-DSWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS>
+  $<$<BOOL:${SwiftCore_ENABLE_STDIN}>:-DSWIFT_STDLIB_HAS_STDIN> # core + stubs
+  $<$<BOOL:${SwiftCore_ENABLE_RUNTIME_OS_VERSIONING}>:-DSWIFT_RUNTIME_OS_VERSIONING> # core + stubs
+  $<$<BOOL:${SwiftCore_ENABLE_INTERNAL_CHECKS}>:-DINTERNAL_CHECKS_ENABLED> # core
+  $<$<BOOL:${SwiftCore_ENABLE_STATIC_PRINT}>:-DSWIFT_STDLIB_STATIC_PRINT> # core + concurrency
+  $<$<BOOL:${SwiftCore_ENABLE_UNICODE_DATA}>:-DSWIFT_STDLIB_ENABLE_UNICODE_DATA> # Stubs
+  $<$<BOOL:${SwiftCore_ENABLE_ENVIRONMENT}>:-DSWIFT_STDLIB_HAS_ENVIRON> # Concurrency, runtime, shims, platform overlay
+  $<$<BOOL:${SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT}>:-DSWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT> # Concurrency, Compatibility override, magic symbols
+  $<$<COMPILE_LANGUAGE:C,CXX>:-DSWIFT_RUNTIME_ENABLE_LEAK_CHECKER=$<BOOL:${SwiftCore_ENABLE_RUNTIME_LEAK_CHECKER}>>
+  $<$<COMPILE_LANGUAGE:C,CXX>:-DSWIFT_RUNTIME_CLOBBER_FREED_OBJECTS=$<BOOL:${SwiftCore_ENABLE_CLOBBER_FREED_OBJECTS}>>)
+
+add_compile_options(
+  $<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>
+  $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
+  $<$<COMPILE_LANGUAGE:CXX>:-funwind-tables>
+  $<$<AND:$<COMPILE_LANGUAGE:Swift>,$<BOOL:${SwiftCore_ENABLE_LIBRARY_EVOLUTION}>>:-enable-library-evolution>)
+
+include_directories(include)
+
+add_subdirectory(LLVMSupport)
+add_subdirectory(SwiftShims/swift/shims)
+add_subdirectory(Demangling)
+add_subdirectory(Threading)
+add_subdirectory(runtime)
+add_subdirectory(stubs)
+add_subdirectory(CommandLineSupport)
+add_subdirectory(core)

Runtimes/Core/CommandLineSupport/CMakeLists.txt

@@ -0,0 +1,15 @@
+if(SwiftCore_ENABLE_COMMANDLINE_SUPPORT)
+  add_library(swiftCommandLineSupport STATIC CommandLine.cpp)
+  target_include_directories(swiftCommandLineSupport PRIVATE
+    "${SwiftCore_SWIFTC_SOURCE_DIR}/include"
+    "${PROJECT_BINARY_DIR}/include")
+  target_compile_definitions(swiftCommandLineSupport PUBLIC
+    -DSWIFT_STDLIB_HAS_COMMANDLINE)
+
+  target_link_libraries(swiftCommandLineSupport PRIVATE
+    swiftShims)
+
+  if(NOT BUILD_SHARED_LIBS)
+    install(TARGETS swiftCommandLineSupport)
+  endif()
+endif()

Runtimes/Core/Demangling/CMakeLists.txt

@@ -0,0 +1,43 @@
+# FIXME: Refactor demangling library so that we aren't pulling sources from
+#        the compiler.
+add_library(swiftDemangling OBJECT
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Demangling/Context.cpp"
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Demangling/Demangler.cpp"
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Demangling/ManglingUtils.cpp"
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Demangling/NodePrinter.cpp"
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Demangling/Punycode.cpp"
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Demangling/Remangler.cpp"
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Demangling/NodeDumper.cpp"
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Demangling/Errors.cpp")
+target_compile_definitions(swiftDemangling PRIVATE swiftCore_EXPORTS
+  $<$<BOOL:${SwiftCore_ENABLE_OBJC_INTEROP}>:-DSWIFT_SUPPORT_OLD_MANGLING>
+  $<$<BOOL:${SwiftCore_ENABLE_TYPE_PRINTING}>:-DSWIFT_STDLIB_HAS_TYPE_PRINTING>
+  $<$<BOOL:${SwiftCore_ENABLE_CRASH_REPORTER_CLIENT}>:-DSWIFT_HAVE_CRASHREPORTERCLIENT>)
+
+target_include_directories(swiftDemangling
+  PRIVATE
+    "${SwiftCore_SWIFTC_SOURCE_DIR}/include"
+    "${PROJECT_BINARY_DIR}/include")
+
+target_link_libraries(swiftDemangling PRIVATE swiftShims)
+
+if(SwiftCore_ENABLE_CRASH_REPORTER_CLIENT)
+  # We could likely pull the copy from the runtime sources
+  add_library(swiftDemanglingCR OBJECT
+    "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Demangling/CrashReporter.cpp")
+  target_link_libraries(swiftDemanglingCR PRIVATE swiftShims)
+endif()
+
+if(SwiftCore_ENABLE_OBJC_INTEROP)
+  target_sources(swiftDemangling PRIVATE
+    "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Demangling/OldDemangler.cpp"
+    "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Demangling/OldRemangler.cpp")
+endif()
+
+if(LINUX OR BSD)
+  target_compile_options(swiftDemangling PRIVATE -fno-lto)
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+  install(TARGETS swiftDemangling)
+endif()

Runtimes/Core/LLVMSupport/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_library(swiftLLVMSupport OBJECT
+  ErrorHandling.cpp
+  Hashing.cpp
+  MemAlloc.cpp
+  SmallPtrSet.cpp
+  SmallVector.cpp
+  StringRef.cpp)

Runtimes/Core/SwiftShims/swift/shims/CMakeLists.txt

@@ -0,0 +1,37 @@
+# Swift shim header files
+install(FILES
+  AssertionReporting.h
+  CoreFoundationShims.h
+  EmbeddedShims.h
+  FoundationShims.h
+  GlobalObjects.h
+  HeapObject.h
+  KeyPath.h
+  LibcOverlayShims.h
+  LibcShims.h
+  MetadataSections.h
+  Random.h
+  RefCount.h
+  Reflection.h
+  RuntimeShims.h
+  RuntimeStubs.h
+  SwiftStdbool.h
+  SwiftStddef.h
+  SwiftStdint.h
+  System.h
+  Target.h
+  ThreadLocalStorage.h
+  UnicodeData.h
+  Visibility.h
+  _SwiftConcurrency.h
+  _SwiftDistributed.h
+  _SynchronizationShims.h
+  module.modulemap
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/swift/shims")
+
+add_library(swiftShims INTERFACE)
+target_include_directories(swiftShims INTERFACE
+  $<$<COMPILE_LANGUAGE:C,CXX>:${CMAKE_CURRENT_SOURCE_DIR}/../../>
+  $<$<COMPILE_LANGUAGE:Swift>:${CMAKE_CURRENT_SOURCE_DIR}>)
+target_compile_options(swiftShims INTERFACE
+  "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xcc -fmodule-map-file=${CMAKE_CURRENT_SOURCE_DIR}/module.modulemap>")

Runtimes/Core/Threading/CMakeLists.txt

@@ -0,0 +1,10 @@
+# TODO: I think we can build the one that actually matters based on the
+#       platform we're building, rather than relying just on macro definitions
+#       and linking empty objects.
+#       https://github.com/swiftlang/swift/issues/77435
+add_library(swiftThreading OBJECT
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Threading/C11.cpp"
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Threading/Linux.cpp"
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Threading/Pthreads.cpp"
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Threading/Win32.cpp")
+target_link_libraries(swiftThreading PRIVATE swiftShims)

Runtimes/Core/cmake/modules/AvailabilityMacros.cmake

@@ -0,0 +1,5 @@
+file(STRINGS "${SwiftCore_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()