Merge branch 'apple:main' into main

Author: filip-sakel

CMakeLists.txt

@@ -38,9 +38,16 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)
 
 option(BUILD_SHARED_LIBS "build shared libraries" ON)
+option(HAS_LIBDISPATCH_API "has libdispatch API" ON)
+option(BUILD_NETWORKING "build FoundationNetworking module" ON)
+option(BUILD_TOOLS "build tools" ON)
 option(NS_CURL_ASSUME_FEATURES_MISSING "Assume that optional libcurl features are missing rather than test the library's version, for build debugging" NO)
 
-find_package(dispatch CONFIG REQUIRED)
+if(HAS_LIBDISPATCH_API)
+  find_package(dispatch CONFIG REQUIRED)
+endif()
+
+find_package(ICU COMPONENTS uc i18n REQUIRED)
 
 include(SwiftSupport)
 include(GNUInstallDirs)
@@ -53,6 +60,12 @@ set(BUILD_SHARED_LIBS NO)
 add_subdirectory(CoreFoundation EXCLUDE_FROM_ALL)
 set(BUILD_SHARED_LIBS ${SAVED_BUILD_SHARED_LIBS})
 
+# BlocksRuntime is already in libdispatch so it is only needed if libdispatch is
+# NOT being used
+if(NOT HAS_LIBDISPATCH_API)
+  add_subdirectory(Sources/BlocksRuntime)
+endif()
+
 # Setup include paths for uuid/uuid.h
 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/uuid-headers/uuid/uuid.h
   COMMAND
@@ -74,9 +87,22 @@ endif()
 
 if(NOT BUILD_SHARED_LIBS)
   set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS
-    CoreFoundation CFXMLInterface CFURLSessionInterface)
-  install(TARGETS CoreFoundation CFXMLInterface CFURLSessionInterface
+    CoreFoundation CFXMLInterface)
+
+  if(NOT HAS_LIBDISPATCH_API)
+    set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS
+      BlocksRuntime)
+  endif()
+
+  install(TARGETS CoreFoundation CFXMLInterface
     DESTINATION lib/swift_static/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>)
+
+  if(BUILD_NETWORKING)
+    set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS
+      CFURLSessionInterface)
+    install(TARGETS CFURLSessionInterface
+      DESTINATION lib/swift_static/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>)
+  endif()
 endif()
 
 set(swift_lib_dir "lib/swift")

CONTRIBUTING.md

@@ -15,7 +15,7 @@ Please remember to include platform information with your report. If the bug is
 
 ## Pull Requests
 
-Before embarking on a large amount of work to implement missing functionality, please double-check with the community on the [swift-corelibs-dev](https://lists.swift.org/mailman/listinfo/swift-corelibs-dev) mailing list. Someone may already be working in this area, and we want to avoid duplication of work.
+Before embarking on a large amount of work to implement missing functionality, please double-check with the community in the [Swift Forums](https://forums.swift.org/). Someone may already be working in this area, and we want to avoid duplication of work.
 
 If your request includes functionality changes, please be sure to test your code on Linux as well as macOS. Differences in the compiler and runtime on each platform means that code that compiles and runs correctly on Darwin (where the Objective-C runtime is present) may not compile at all on Linux.
 

CoreFoundation/Base.subproj/CFBase.h

@@ -686,7 +686,11 @@ CFTypeRef CFMakeCollectable(CFTypeRef cf) CF_AUTOMATED_REFCOUNT_UNAVAILABLE;
 
 #if DEPLOYMENT_RUNTIME_SWIFT
 
-#define _CF_SWIFT_RC_PINNED_FLAG (0x1)
+#if TARGET_RT_64_BIT
+#define _CF_SWIFT_RC_PINNED_FLAG (0x80000004ffffffff)
+#else
+#define _CF_SWIFT_RC_PINNED_FLAG (0x800004FF)
+#endif
 #define _CF_CONSTANT_OBJECT_STRONG_RC ((uintptr_t)_CF_SWIFT_RC_PINNED_FLAG)
 #endif
 

CoreFoundation/Base.subproj/CFPlatform.c

@@ -59,9 +59,11 @@ int _CFArgc(void) { return *_NSGetArgc(); }
 #endif
 
 
+#if !TARGET_OS_WASI
 CF_PRIVATE Boolean _CFGetCurrentDirectory(char *path, int maxlen) {
     return getcwd(path, maxlen) != NULL;
 }
+#endif
 
 #if TARGET_OS_WIN32
 // Returns the path to the CF DLL, which we can then use to find resources like char sets
@@ -96,8 +98,9 @@ CF_PRIVATE const wchar_t *_CFDLLPath(void) {
     }
     return cachedPath;
 }
-#endif
+#endif // TARGET_OS_WIN32
 
+#if !TARGET_OS_WASI
 static const char *__CFProcessPath = NULL;
 static const char *__CFprogname = NULL;
 
@@ -242,6 +245,7 @@ const char *_CFProcessPath(void) {
     return __CFProcessPath;
 #endif
 }
+#endif // TARGET_OS_WASI
 
 #if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_BSD
 CF_CROSS_PLATFORM_EXPORT Boolean _CFIsMainThread(void) {
@@ -255,13 +259,14 @@ CF_CROSS_PLATFORM_EXPORT Boolean _CFIsMainThread(void) {
 #include <syscall.h>
 #else
 #include <sys/syscall.h>
-#endif
+#endif // __has_include(<syscall.h>)
 
 Boolean _CFIsMainThread(void) {
     return syscall(SYS_gettid) == getpid();
 }
-#endif
+#endif // TARGET_OS_LINUX
 
+#if !TARGET_OS_WASI
 CF_PRIVATE CFStringRef _CFProcessNameString(void) {
     static CFStringRef __CFProcessNameString = NULL;
     if (!__CFProcessNameString) {
@@ -274,7 +279,7 @@ CF_PRIVATE CFStringRef _CFProcessNameString(void) {
     }
     return __CFProcessNameString;
 }
-
+#endif // !TARGET_OS_WASI
 
 #if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD
 
@@ -369,7 +374,7 @@ static CFURLRef _CFCopyHomeDirURLForUser(const char *username, bool fallBackToHo
 
 #endif
 
-
+#if !TARGET_OS_WASI
 #define CFMaxHostNameLength	256
 #define CFMaxHostNameSize	(CFMaxHostNameLength+1)
 
@@ -582,6 +587,7 @@ CF_EXPORT CFURLRef CFCopyHomeDirectoryURLForUser(CFStringRef uName) {
 
 #undef CFMaxHostNameLength
 #undef CFMaxHostNameSize
+#endif // !TARGET_OS_WASI
 
 #if TARGET_OS_WIN32
 CF_INLINE CFIndex strlen_UniChar(const UniChar* p) {
@@ -720,11 +726,17 @@ CF_PRIVATE void __CFTSDWindowsCleanup() {
 
 static _CFThreadSpecificKey __CFTSDIndexKey;
 
+#if TARGET_OS_WASI
+static void *__CFThreadSpecificData;
+#endif
+
 CF_PRIVATE void __CFTSDInitialize() {
+#if !TARGET_OS_WASI
     static dispatch_once_t once;
     dispatch_once(&once, ^{
         (void)pthread_key_create(&__CFTSDIndexKey, __CFTSDFinalize);
     });
+#endif
 }
 
 #endif
@@ -736,6 +748,8 @@ static void __CFTSDSetSpecific(void *arg) {
     pthread_setspecific(__CFTSDIndexKey, arg);
 #elif TARGET_OS_WIN32
     FlsSetValue(__CFTSDIndexKey, arg);
+#elif TARGET_OS_WASI
+    __CFThreadSpecificData = arg;
 #endif
 }
 
@@ -746,16 +760,22 @@ static void *__CFTSDGetSpecific() {
     return pthread_getspecific(__CFTSDIndexKey);
 #elif TARGET_OS_WIN32
     return FlsGetValue(__CFTSDIndexKey);
+#elif TARGET_OS_WASI
+    return __CFThreadSpecificData;
 #endif
 }
 
 _Atomic(bool) __CFMainThreadHasExited = false;
 
 static void __CFTSDFinalize(void *arg) {
+#if TARGET_OS_WASI
+    __CFMainThreadHasExited = true;
+#else
     if (pthread_main_np() == 1) {
         // Important: we need to be sure that the only time we set this flag to true is when we actually can guarentee we ARE the main thread. 
         __CFMainThreadHasExited = true;
     }
+#endif
 
     // Set our TSD so we're called again by pthreads. It will call the destructor PTHREAD_DESTRUCTOR_ITERATIONS times as long as a value is set in the thread specific data. We handle each case below.
     __CFTSDSetSpecific(arg);
@@ -779,7 +799,7 @@ static void __CFTSDFinalize(void *arg) {
         }
     }
 
-#if _POSIX_THREADS
+#if _POSIX_THREADS && !TARGET_OS_WASI
     if (table->destructorCount == PTHREAD_DESTRUCTOR_ITERATIONS - 1) {    // On PTHREAD_DESTRUCTOR_ITERATIONS-1 call, destroy our data
         free(table);
 
@@ -1303,9 +1323,9 @@ CF_PRIVATE int _NS_gettimeofday(struct timeval *tv, struct timezone *tz) {
 #endif // TARGET_OS_WIN32
 
 #pragma mark -
-#pragma mark Linux OSAtomic
+#pragma mark Linux, BSD, and WASI OSAtomic
 
-#if TARGET_OS_LINUX || TARGET_OS_BSD
+#if TARGET_OS_LINUX || TARGET_OS_BSD || TARGET_OS_WASI
 
 bool OSAtomicCompareAndSwapPtr(void *oldp, void *newp, void *volatile *dst) 
 { 
@@ -1364,7 +1384,7 @@ void OSMemoryBarrier() {
     __sync_synchronize();
 }
 
-#endif // TARGET_OS_LINUX
+#endif // TARGET_OS_LINUX || TARGET_OS_BSD || TARGET_OS_WASI
 
 #pragma mark -
 #pragma mark Dispatch Replacements
@@ -1378,11 +1398,15 @@ typedef struct _CF_sema_s {
 } * _CF_sema_t;
 
 CF_INLINE void _CF_sem_signal(_CF_sema_t s) {
+#if !TARGET_OS_WASI
     sem_post(&s->sema);
+#endif
 }
 
 CF_INLINE void _CF_sem_wait(_CF_sema_t s) {
+#if !TARGET_OS_WASI
     sem_wait(&s->sema);
+#endif
 }
 
 static void _CF_sem_destroy(_CF_sema_t s) {
@@ -1391,6 +1415,7 @@ static void _CF_sem_destroy(_CF_sema_t s) {
 
 CF_INLINE _CFThreadSpecificKey _CF_thread_sem_key() {
     static _CFThreadSpecificKey key = 0;
+#if !TARGET_OS_WASI
     static OSSpinLock lock = OS_SPINLOCK_INIT;
     if (key == 0) {
         OSSpinLockLock(&lock);
@@ -1399,9 +1424,11 @@ CF_INLINE _CFThreadSpecificKey _CF_thread_sem_key() {
         }
         OSSpinLockUnlock(&lock);
     }
+#endif
     return key;
 }
 
+#if !TARGET_OS_WASI
 CF_INLINE _CF_sema_t _CF_get_thread_semaphore() {
     _CFThreadSpecificKey key = _CF_thread_sem_key();
     _CF_sema_t s = (_CF_sema_t)pthread_getspecific(key);
@@ -1416,6 +1443,7 @@ CF_INLINE _CF_sema_t _CF_get_thread_semaphore() {
 CF_INLINE void _CF_put_thread_semaphore(_CF_sema_t s) {
     pthread_setspecific(_CF_thread_sem_key(), s);
 }
+#endif
 
 #define CF_DISPATCH_ONCE_DONE ((_CF_dispatch_once_waiter_t)~0l)
 
@@ -1435,6 +1463,12 @@ defined(__arm64__)
 #endif
 
 void _CF_dispatch_once(dispatch_once_t *predicate, void (^block)(void)) {
+#if TARGET_OS_WASI
+    if (!*predicate) {
+        block();
+        *predicate = 1;
+    }
+#else
     _CF_dispatch_once_waiter_t volatile *vval = (_CF_dispatch_once_waiter_t*)predicate;
     struct _CF_dispatch_once_waiter_s dow = { NULL };
     _CF_dispatch_once_waiter_t tail = &dow, next, tmp;
@@ -1465,6 +1499,7 @@ void _CF_dispatch_once(dispatch_once_t *predicate, void (^block)(void)) {
         }
         _CF_put_thread_semaphore(dow.dow_sema);
     }
+#endif // TARGET_OS_WASI
 }
 
 #endif
@@ -1689,7 +1724,7 @@ CF_EXPORT char **_CFEnviron(void) {
 #elif TARGET_OS_WIN32
     return _environ;
 #else
-#if TARGET_OS_BSD
+#if TARGET_OS_BSD || TARGET_OS_WASI
     extern char **environ;
 #endif
     return environ;
@@ -1711,7 +1746,7 @@ int _CFOpenFile(const char *path, int opts) {
 }
 
 CF_CROSS_PLATFORM_EXPORT void *_CFReallocf(void *ptr, size_t size) {
-#if TARGET_OS_WIN32 || TARGET_OS_LINUX || defined(__OpenBSD__)
+#if TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_WASI || defined(__OpenBSD__)
     void *mem = realloc(ptr, size);
     if (mem == NULL && ptr != NULL && size != 0) {
         free(ptr);
@@ -2056,7 +2091,7 @@ CF_EXPORT int _CFPosixSpawn(pid_t *_CF_RESTRICT pid, const char *_CF_RESTRICT pa
     return _CFPosixSpawnImpl(pid, path, file_actions, attrp, argv, envp);
 }
 
-#elif !TARGET_OS_WIN32
+#elif !TARGET_OS_WIN32 && !TARGET_OS_WASI
 
 #include <spawn.h>
 

CoreFoundation/Base.subproj/CFPriv.h

@@ -46,14 +46,17 @@
 #include <CoreFoundation/CFMessagePort.h>
 #endif
 
+#if !TARGET_OS_WASI
 #include <CoreFoundation/CFRunLoop.h>
 #include <CoreFoundation/CFSocket.h>
+#endif
 #include <CoreFoundation/CFBundlePriv.h>
 
 CF_EXTERN_C_BEGIN
 
 CF_EXPORT void _CFRuntimeSetCFMPresent(void *a);
 
+#if !TARGET_OS_WASI
 CF_EXPORT const char *_CFProcessPath(void);
 CF_EXPORT const char **_CFGetProcessPath(void);
 CF_EXPORT const char **_CFGetProgname(void);
@@ -65,6 +68,7 @@ CF_EXPORT void _CFGetUGIDs(uid_t *euid, gid_t *egid);
 CF_EXPORT uid_t _CFGetEUID(void);
 CF_EXPORT uid_t _CFGetEGID(void);
 #endif
+#endif
 
 #if (TARGET_OS_MAC && !(TARGET_OS_IPHONE || TARGET_OS_LINUX))
 CF_EXPORT void _CFRunLoopSetCurrent(CFRunLoopRef rl);
@@ -161,6 +165,7 @@ CF_EXPORT Boolean _CFStringGetFileSystemRepresentation(CFStringRef string, UInt8
 /* If this is publicized, we might need to create a GetBytesPtr type function as well. */
 CF_EXPORT CFStringRef _CFStringCreateWithBytesNoCopy(CFAllocatorRef alloc, const UInt8 *bytes, CFIndex numBytes, CFStringEncoding encoding, Boolean externalFormat, CFAllocatorRef contentsDeallocator);
 
+#if !TARGET_OS_WASI
 /* These return NULL on MacOS 8 */
 // This one leaks the returned string in order to be thread-safe.
 // CF cannot help you in this matter if you continue to use this SPI.
@@ -172,6 +177,7 @@ CFStringRef CFCopyUserName(void);
 
 CF_EXPORT
 CFURLRef CFCopyHomeDirectoryURLForUser(CFStringRef uName);	/* Pass NULL for the current user's home directory */
+#endif
 
 
 /*
@@ -630,8 +636,10 @@ typedef CF_OPTIONS(CFOptionFlags, _CFBundleFilteredPlistOptions) {
     _CFBundleFilteredPlistMemoryMapped = 1
 } API_AVAILABLE(macos(10.8), ios(6.0), watchos(2.0), tvos(9.0));
 
+#if !TARGET_OS_WASI
 CF_EXPORT CFPropertyListRef _CFBundleCreateFilteredInfoPlist(CFBundleRef bundle, CFSetRef keyPaths, _CFBundleFilteredPlistOptions options) API_AVAILABLE(macos(10.8), ios(6.0), watchos(2.0), tvos(9.0));
 CF_EXPORT CFPropertyListRef _CFBundleCreateFilteredLocalizedInfoPlist(CFBundleRef bundle, CFSetRef keyPaths, CFStringRef localizationName, _CFBundleFilteredPlistOptions options) API_AVAILABLE(macos(10.8), ios(6.0), watchos(2.0), tvos(9.0));
+#endif
 
 #if TARGET_OS_WIN32
 #include <CoreFoundation/CFNotificationCenter.h>