Merge branch 'swiftlang:main' into SHGetKnownFolderPath-Continued

Author: ShikiSuen

.github/workflows/automerge_to_main.yml

@@ -0,0 +1,20 @@
+name: Create PR to merge release branch into the main branch
+# At the end of a release cycle, we may want to automatically include all changes to release branches on the main branch to avoid the need for cherry-picking changes back to release branches
+# This workflow can be disabled earlier in the release cycle in the GitHub UI as described in https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow
+permissions:
+  contents: read
+on:
+  schedule:
+    - cron: '0 9 * * *'
+  workflow_dispatch:
+jobs:
+  create_merge_pr:
+    name: Create PR to merge release branch into main branch
+    uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main
+    with:
+      base_branch: main
+      head_branch: release/6.2
+    permissions:
+      contents: write
+      pull-requests: write
+    if: (github.event_name == 'schedule' && github.repository == 'swiftlang/swift-corelibs-foundation') || (github.event_name != 'schedule')  # Ensure that we don't run this on a schedule in a fork

.github/workflows/automerge_to_release.yml

@@ -0,0 +1,19 @@
+name: Create PR to merge main into release branch
+# In the first period after branching the release branch, we typically want to include many changes from `main` in the release branch. This workflow automatically creates a PR every Monday to merge main into the release branch.
+# Later in the release cycle we should stop this practice to avoid landing risky changes by disabling this workflow. To do so, disable the workflow as described in https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow
+permissions:
+  contents: read
+on:
+  schedule:
+    - cron: '0 9 * * MON'
+  workflow_dispatch:
+jobs:
+  create_merge_pr:
+    name: Create PR to merge main into release branch
+    uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main
+    with:
+      base_branch: release/6.2
+    permissions:
+      contents: write
+      pull-requests: write
+    if: (github.event_name == 'schedule' && github.repository == 'swiftlang/swift-corelibs-foundation') || (github.event_name != 'schedule')  # Ensure that we don't run this on a schedule in a fork

CMakeLists.txt

@@ -40,6 +40,13 @@ endif()
 project(Foundation
     LANGUAGES C Swift)
 
+option(FOUNDATION_SWIFTPM_DEPS "build Windows SwiftPM dependencies via CMake" NO)
+if(FOUNDATION_SWIFTPM_DEPS)
+    include(WindowsSwiftPMDependencies)
+    _foundation_setup_windows_swiftpm_dependencies_target()
+    return()
+endif()
+
 if(NOT SWIFT_SYSTEM_NAME)
   if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
     set(SWIFT_SYSTEM_NAME macosx)
@@ -212,6 +219,12 @@ else()
         "/clang:-fcf-runtime-abi=swift")
 endif()
 
+set(CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH ON)
+set(CMAKE_INSTALL_RPATH "$ORIGIN")
+if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD|DragonFlyBSD")
+    add_link_options("LINKER:-z,origin")
+endif()
+
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
     list(APPEND _Foundation_common_build_flags
         "-DDEBUG")

Package.swift

@@ -58,7 +58,9 @@ if let environmentPath = Context.environment["CURL_INCLUDE_PATH"] {
 
 var curlLinkFlags: [LinkerSetting] = [
     .linkedLibrary("libcurl.lib", .when(platforms: [.windows])),
-    .linkedLibrary("zlibstatic.lib", .when(platforms: [.windows]))
+    .linkedLibrary("zlibstatic.lib", .when(platforms: [.windows])),
+    .linkedLibrary("brotlicommon.lib", .when(platforms: [.windows])),
+    .linkedLibrary("brotlidec.lib", .when(platforms: [.windows]))
 ]
 if let environmentPath = Context.environment["CURL_LIBRARY_PATH"] {
     curlLinkFlags.append(.unsafeFlags([
@@ -70,6 +72,11 @@ if let environmentPath = Context.environment["ZLIB_LIBRARY_PATH"] {
         "-L\(environmentPath)"
     ]))
 }
+if let environmentPath = Context.environment["BROTLI_LIBRARY_PATH"] {
+    curlLinkFlags.append(.unsafeFlags([
+        "-L\(environmentPath)"
+    ]))
+}
 
 var libxmlLinkFlags: [LinkerSetting] = [
     .linkedLibrary("libxml2s.lib", .when(platforms: [.windows]))
@@ -349,7 +356,7 @@ let package = Package(
                 "FoundationNetworking",
                 "XCTest",
                 "Testing",
-                .target(name: "xdgTestHelper", condition: .when(platforms: [.linux, .android]))
+                .target(name: "xdgTestHelper", condition: .when(platforms: [.linux, .android, .windows]))
             ],
             resources: [
                 .copy("Foundation/Resources")

README.md

@@ -72,6 +72,17 @@ swift-corelibs-foundation builds as a standalone project using Swift Package Man
 
 swift-corelibs-foundation also builds as part of the toolchain for non-Darwin platforms. Instructions on building the toolchain are available in the [Swift project](https://github.com/swiftlang/swift?tab=readme-ov-file#building).
 
+### Building swift-corelibs-foundation on Windows
+
+When building Foundation as a standalone project, it requires you to provide some dependencies that it will link during the build. SwiftPM already fetches most of these dependencies and on Linux the remaining dependencies (dispatch, zlib, curl, libxml) are found in the Swift toolchain or on the host OS. However, Windows does not ship with zlib/curl/libxml on the host OS. In order to build swift-corelibs-foundation as a package on Windows, you must first checkout and build these dependenies before running `swift build` as recommended above. To do this, you can build the provided CMake target which (instead of building Foundation via CMake) will checkout and build these 3 dependencies via CMake and provide environment variables that will connect the SwiftPM build to these dependencies. To build these targets, run the following commands:
+
+```
+cmake -G Ninja -B <build folder> -DFOUNDATION_SWIFTPM_DEPS=YES
+cmake --build <build folder> --target --target WindowsSwiftPMDependencies
+```
+
+After running these commands, the output will include a list of environment variables to set. After setting these environment variables, you can run `swift test`/`swift build` just like on Linux in order to build swift-corelibs-foundation with an existing Swift toolchain.
+
 ## Contributions
 
 We welcome contributions to Foundation! Please see the [known issues](Docs/Issues.md) page if you are looking for an area where we need help. We are also standing by on the [mailing lists](https://swift.org/community/#communication) to answer questions about what is most important to do and what we will accept into the project.

Sources/CoreFoundation/CFBundle.c

@@ -255,22 +255,26 @@ CF_PRIVATE CFURLRef _CFURLCreateResolvedDirectoryWithString(CFAllocatorRef alloc
 #pragma mark -
 #pragma mark Bundle Tables
 
+static void __CFBundleCreateAllBundlesArrayLocked() {
+    CFArrayCallBacks callbacks = kCFTypeArrayCallBacks;
+#if TARGET_OS_OSX
+    if (_useUnsafeUnretainedTables()) {
+        callbacks.retain = NULL;
+        callbacks.release = NULL;
+    }
+#endif
+    // The _allBundles array holds a strong reference on the bundle.
+    // It does this to prevent a race on bundle deallocation / creation. See: <rdar://problem/6606482> CFBundle isn't thread-safe in RR mode
+    // Also, the existence of the CFBundleGetBundleWithIdentifier / CFBundleGetAllBundles API means that any bundle we hand out from there must be permanently retained, or callers will potentially have an object that can be deallocated out from underneath them.
+    _allBundles = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &callbacks);
+}
+
 static void _CFBundleAddToTablesLocked(CFBundleRef bundle, CFStringRef bundleID) {
     if (bundle->_isUnique) return;
 
     // Add to the _allBundles list
     if (!_allBundles) {
-        CFArrayCallBacks callbacks = kCFTypeArrayCallBacks;
-#if TARGET_OS_OSX
-        if (_useUnsafeUnretainedTables()) {
-            callbacks.retain = NULL;
-            callbacks.release = NULL;
-        }
-#endif
-        // The _allBundles array holds a strong reference on the bundle.
-        // It does this to prevent a race on bundle deallocation / creation. See: <rdar://problem/6606482> CFBundle isn't thread-safe in RR mode
-        // Also, the existence of the CFBundleGetBundleWithIdentifier / CFBundleGetAllBundles API means that any bundle we hand out from there must be permanently retained, or callers will potentially have an object that can be deallocated out from underneath them.
-        _allBundles = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &callbacks);
+        __CFBundleCreateAllBundlesArrayLocked();
     }
     CFArrayAppendValue(_allBundles, bundle);
 
@@ -1795,6 +1799,11 @@ CF_EXPORT CFArrayRef _CFBundleCopyAllBundles(void) {
     _CFBundleEnsureAllBundlesUpToDate();
     CFBundleRef main = CFBundleGetMainBundle();
     _CFMutexLock(&CFBundleGlobalDataLock);
+    // There is a chance that `_allBundles` haven't been initiated
+    // if no one called `CFBundleCreate()` yet
+    if (!_allBundles) {
+        __CFBundleCreateAllBundlesArrayLocked();
+    }
     // _allBundles does not include the main bundle, so insert it here.
     CFMutableArrayRef bundles = CFArrayCreateMutableCopy(kCFAllocatorSystemDefault, CFArrayGetCount(_allBundles) + 1, _allBundles);
     _CFMutexUnlock(&CFBundleGlobalDataLock);

Sources/CoreFoundation/CFCalendar.c

@@ -33,8 +33,8 @@ enum {
 
 #define ICU_LOG(FMT, ...) do { } while (0)
 
-#define MIN_CALENDAR_TIME -211845067200.0 // Julian day 0 (-4713-01-01 12:00:00 +0000) in CFAbsoluteTime.
-#define MAX_CALENDAR_TIME 15927175497600.0 // 50000-01-01 00:00:00 +0000, smaller than the max time ICU supported.
+#define MIN_CALENDAR_TIME -211845067200.0 // Julian day 0 (-4712-01-01 12:00:00 +0000) in CFAbsoluteTime.
+#define MAX_CALENDAR_TIME 15927175497600.0 // 506713-02-07 00:00:00 +0000, smaller than the max time ICU supported.
 #define __CFCalendarValidateAndCapTimeRange(at) do { \
     if (at < MIN_CALENDAR_TIME || at > MAX_CALENDAR_TIME) { \
         os_log_error(_CFOSLog(), "CFAbsoluteTime %lf exceeds calendar calculation range.", at); \

Sources/CoreFoundation/CFPlatform.c

@@ -961,7 +961,9 @@ static void __CFTSDFinalize(void *arg) {
 
         // FreeBSD libthr emits debug message to stderr if there are leftover nonnull TSD after PTHREAD_DESTRUCTOR_ITERATIONS
         // On this platform, the destructor will never be called again, therefore it is unneccessary to set the TSD to CF_TSD_BAD_PTR
-        #if !defined(__FreeBSD__)
+        #if defined(__FreeBSD__)
+        __CFTSDSetSpecific(NULL);
+        #else
         // Now if the destructor is called again we will take the shortcut at the beginning of this function.
         __CFTSDSetSpecific(CF_TSD_BAD_PTR);
         #endif
@@ -1948,7 +1950,7 @@ CF_CROSS_PLATFORM_EXPORT void *_CFReallocf(void *ptr, size_t size) {
 #endif
 }
 
-#if TARGET_OS_ANDROID
+#if TARGET_OS_ANDROID && __ANDROID_API__ < 28
 
 #include <dlfcn.h>
 #include <spawn.h>
@@ -2277,6 +2279,10 @@ CF_EXPORT int _CFPosixSpawnFileActionsAddClose(_CFPosixSpawnFileActionsRef file_
     return _CFPosixSpawnFileActionsAddCloseImpl(file_actions, filedes);
 }
 
+CF_EXPORT int _CFPosixSpawnFileActionsChdir(_CFPosixSpawnFileActionsRef file_actions, const char *path) {
+  return ENOSYS;
+}
+
 CF_EXPORT int _CFPosixSpawn(pid_t *_CF_RESTRICT pid, const char *_CF_RESTRICT path, _CFPosixSpawnFileActionsRef file_actions, _CFPosixSpawnAttrRef _Nullable _CF_RESTRICT attrp, char *_Nullable const argv[_Nullable _CF_RESTRICT], char *_Nullable const envp[_Nullable _CF_RESTRICT]) {
     _CFPosixSpawnInitialize();
     return _CFPosixSpawnImpl(pid, path, file_actions, attrp, argv, envp);
@@ -2317,12 +2323,15 @@ CF_EXPORT int _CFPosixSpawnFileActionsChdir(_CFPosixSpawnFileActionsRef file_act
   // Glibc versions prior to 2.29 don't support posix_spawn_file_actions_addchdir_np, impacting:
   //  - Amazon Linux 2 (EoL mid-2025)
   return ENOSYS;
+  #elif defined(__ANDROID__) && __ANDROID_API__ < 34
+  // Android versions prior to 14 (API level 34) don't support posix_spawn_file_actions_addchdir_np
+  return ENOSYS;
   #elif defined(__OpenBSD__) || defined(__QNX__)
   // Currently missing as of:
   //  - OpenBSD 7.5 (April 2024)
   //  - QNX 8 (December 2023)
   return ENOSYS;
-  #elif defined(__GLIBC__) || TARGET_OS_DARWIN || defined(__FreeBSD__) || (defined(__ANDROID__) && __ANDROID_API__ >= 34) || defined(__musl__)
+  #elif defined(__GLIBC__) || TARGET_OS_DARWIN || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__musl__)
   // Pre-standard posix_spawn_file_actions_addchdir_np version available in:
   //  - Solaris 11.3 (October 2015)
   //  - Glibc 2.29 (February 2019)

Sources/CoreFoundation/CFRunLoop.c

@@ -72,12 +72,14 @@ extern bool _dispatch_runloop_root_queue_perform_4CF(dispatch_queue_t queue);
 
 #if TARGET_OS_MAC
 typedef mach_port_t dispatch_runloop_handle_t;
-#elif defined(__linux__) || defined(__FreeBSD__)
+#elif TARGET_OS_LINUX
 typedef int dispatch_runloop_handle_t;
+#elif TARGET_OS_BSD
+typedef uint64_t dispatch_runloop_handle_t;
 #elif TARGET_OS_WIN32
 typedef HANDLE dispatch_runloop_handle_t;
 #else
-typedef uint64_t dispatch_runloop_handle_t;
+#error "runloop support not implemented on this platform"
 #endif
 
 #if TARGET_OS_MAC

Sources/CoreFoundation/CMakeLists.txt

@@ -99,7 +99,8 @@ add_library(CoreFoundation STATIC
     CFWindowsUtilities.c
     CFXMLPreferencesDomain.c
     uuid.c)
-
+target_compile_definitions(CoreFoundation PRIVATE
+  $<$<AND:$<PLATFORM_ID:Windows>,$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>>:CF_WINDOWS_EXECUTABLE_INITIALIZER>)
 target_include_directories(CoreFoundation
     PUBLIC
         include