Merge branch 'master' into fix-Data.count-setter

Author: lorentey

CMakeLists.txt

@@ -17,14 +17,18 @@ enable_testing()
 # Cache the variable to allow the user to alter the configuration.
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL" CACHE
   STRING "MSVC Runtime Library")
+
 if(CMAKE_VERSION VERSION_LESS 3.16.0)
   if(NOT (CMAKE_SYSTEM_NAME STREQUAL Windows OR CMAKE_SYSTEM_NAME STREQUAL Darwin))
     set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG "-Xlinker -rpath -Xlinker ")
     set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG_SEP ":")
   endif()
+  # Workaround for CMake 3.15 which doesn't link libraries properly on Windows
+  set(CMAKE_LINK_LIBRARY_FLAG "-l")
 endif()
 
 option(BUILD_SHARED_LIBS "build shared libraries" 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)
 
@@ -40,16 +44,22 @@ add_subdirectory(CoreFoundation EXCLUDE_FROM_ALL)
 set(BUILD_SHARED_LIBS ${SAVED_BUILD_SHARED_LIBS})
 
 # Setup include paths for uuid/uuid.h
+add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/uuid-headers/uuid/uuid.h
+  COMMAND
+    ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/uuid-headers/uuid
+  COMMAND
+    ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/Sources/UUID/uuid.h ${CMAKE_BINARY_DIR}/uuid-headers/uuid/uuid.h)
+add_custom_target(uuid-headers
+  DEPENDS ${CMAKE_BINARY_DIR}/uuid-headers/uuid/uuid.h)
+add_dependencies(CoreFoundation uuid-headers)
 target_include_directories(CoreFoundation PRIVATE
-  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/uuid-headers
   ${CMAKE_CURRENT_BINARY_DIR}/CoreFoundation.framework/Headers)
 
-add_subdirectory(uuid)
-add_subdirectory(Foundation)
-add_subdirectory(Tools)
+add_subdirectory(Sources)
 if(ENABLE_TESTING)
   find_package(XCTest CONFIG REQUIRED)
-  add_subdirectory(TestFoundation)
+  add_subdirectory(Tests)
 endif()
 
 if(NOT BUILD_SHARED_LIBS)

CONTRIBUTING.md

@@ -11,7 +11,7 @@ By submitting a pull request, you represent that you have the right to license y
 
 You can use the `Foundation` component in the [bug reporter](https://bugs.swift.org) if you know your bug is specifically about Swift Foundation.
 
-Please remember to include platform information with your report. If the bug is about the Foundation framework on Darwin, then please use the [Apple bug reporting system](https://bugreport.apple.com).
+Please remember to include platform information with your report. If the bug is about the Foundation framework on Darwin, then please use [Feedback Assistant](https://feedbackassistant.apple.com).
 
 ## Pull Requests
 

CoreFoundation/Base.subproj/CFAvailability.h

@@ -10,13 +10,7 @@
 #if !defined(__COREFOUNDATION_CFAVAILABILITY__)
 #define __COREFOUNDATION_CFAVAILABILITY__ 1
 
-#if __has_include(<CoreFoundation/TargetConditionals.h>)
 #include <CoreFoundation/TargetConditionals.h>
-#elif __has_include(<TargetConditionals.h>)
-#include <TargetConditionals.h>
-#else
-#error Missing header TargetConditionals.h
-#endif
 
 #if __has_include(<Availability.h>) && __has_include(<os/availability.h>) && __has_include(<AvailabilityMacros.h>)
 #include <Availability.h>

CoreFoundation/Base.subproj/CFBase.h

@@ -10,11 +10,7 @@
 #if !defined(__COREFOUNDATION_CFBASE__)
 #define __COREFOUNDATION_CFBASE__ 1
 
-#if DEPLOYMENT_RUNTIME_SWIFT
 #include <CoreFoundation/TargetConditionals.h>
-#else
-#include <TargetConditionals.h>
-#endif
 #include <CoreFoundation/CFAvailability.h>
 
 #if (defined(__CYGWIN32__) || defined(_WIN32)) && !defined(__WIN32__)

CoreFoundation/Base.subproj/CFFileUtilities.c

@@ -372,7 +372,6 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc,
         }
     }
 
-    struct dirent buffer;
     struct dirent *dp;
     int err;
 
@@ -389,7 +388,7 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc,
     }
     files = CFArrayCreateMutable(alloc, 0, & kCFTypeArrayCallBacks);
 
-    while((0 == readdir_r(dirp, &buffer, &dp)) && dp) {
+    while((dp = readdir(dirp))) {
         CFURLRef fileURL;
 	unsigned namelen = strlen(dp->d_name);
 
@@ -1059,14 +1058,28 @@ CF_PRIVATE void _CFIterateDirectory(CFStringRef directoryPath, Boolean appendSla
                 continue;
             }
 
-            assert(!stuffToPrefix && "prefix not yet implemented");
+            const UniChar kSlash = CFPreferredSlash;
+
+            CFStringAppendBuffer buffer;
+            CFStringInitAppendBuffer(kCFAllocatorSystemDefault, &buffer);
+
+            if (stuffToPrefix) {
+              for (CFIndex i = 0, e = CFArrayGetCount(stuffToPrefix); i < e; i++) {
+                CFStringRef entry = CFArrayGetValueAtIndex(stuffToPrefix, i);
+                CFStringAppendStringToAppendBuffer(&buffer, entry);
+                if (CFStringGetCharacterAtIndex(entry, CFStringGetLength(entry) - 1) != _CFGetSlash()) {
+                  CFStringAppendCharactersToAppendBuffer(&buffer, &kSlash, 1);
+                }
+              }
+            }
+
+            CFStringAppendStringToAppendBuffer(&buffer, fileName);
             Boolean isDirectory = file.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
-            CFMutableStringRef filePath = CFStringCreateMutableCopy(kCFAllocatorSystemDefault, nameLen + 1, fileName);
             if (appendSlashForDirectories && isDirectory) {
-                UniChar slash = CFPreferredSlash;
-                CFStringAppendCharacters(filePath, &slash, 1);
+              CFStringAppendCharactersToAppendBuffer(&buffer, &kSlash, 1);
             }
 
+            CFMutableStringRef filePath = CFStringCreateMutableWithAppendBuffer(&buffer);
             Boolean result = fileHandler(fileName, filePath, isDirectory ? DT_DIR : DT_REG);
             CFRelease(fileName);
             CFRelease(filePath);

CoreFoundation/Base.subproj/CFPlatform.c

@@ -28,6 +28,7 @@
 #include <WinIoCtl.h>
 #include <direct.h>
 #include <process.h>
+#include <processthreadsapi.h>
 #define SECURITY_WIN32
 #include <Security.h>
 
@@ -1337,10 +1338,7 @@ void _CF_dispatch_once(dispatch_once_t *predicate, void (^block)(void)) {
     } else {
         dow.dow_sema = _CF_get_thread_semaphore();
         next = *vval;
-        for (;;) {
-            if (next == CF_DISPATCH_ONCE_DONE) {
-                break;
-            }
+        while (next != CF_DISPATCH_ONCE_DONE) {
             if (__sync_bool_compare_and_swap(vval, next, tail, &next)) {
                 dow.dow_thread = next->dow_thread;
                 dow.dow_next = next;
@@ -1453,43 +1451,29 @@ _CFThreadRef _CFThreadCreate(const _CFThreadAttributes attrs, void *_Nullable (*
 #endif
 }
 
-#if TARGET_OS_WIN32
-
-// This code from here:
-// http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx
-
-const DWORD MS_VC_EXCEPTION=0x406D1388;
-#pragma pack(push,8)
-typedef struct tagTHREADNAME_INFO
-{
-    DWORD dwType; // Must be 0x1000.
-    LPCSTR szName; // Pointer to name (in user addr space).
-    DWORD dwThreadID; // Thread ID (-1=caller thread).
-    DWORD dwFlags; // Reserved for future use, must be zero.
-} THREADNAME_INFO;
-#pragma pack(pop)
-
-#endif
-
 CF_CROSS_PLATFORM_EXPORT int _CFThreadSetName(_CFThreadRef thread, const char *_Nonnull name) {
 #if TARGET_OS_MAC
     if (pthread_equal(pthread_self(), thread)) {
         return pthread_setname_np(name);
     }
     return EINVAL;
 #elif TARGET_OS_WIN32
-    THREADNAME_INFO info;
+    // Convert To UTF-16
+    int szLength =
+        MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, name, -1, NULL, 0);
+    if (szLength == 0) {
+        return EINVAL;
+    }
 
-    info.dwType = 0x1000;
-    info.szName = name;
-    info.dwThreadID = GetThreadId(thread);
-    info.dwFlags = 0;
+    WCHAR *pszThreadDescription = calloc(szLength + 1, sizeof(WCHAR));
+    MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, name, -1,
+                        pszThreadDescription, szLength);
 
-    __try {
-        RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR),
-                       (ULONG_PTR*)&info);
-    } __except(EXCEPTION_EXECUTE_HANDLER) {
-    }
+    // Set Thread Name
+    SetThreadDescription(thread, pszThreadDescription);
+
+    // Free Conversion
+    free(pszThreadDescription);
 
     return 0;
 #elif TARGET_OS_LINUX
@@ -1513,6 +1497,33 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadGetName(char *buf, int length) {
     return 0;
 #elif TARGET_OS_LINUX
     return pthread_getname_np(pthread_self(), buf, length);
+#elif TARGET_OS_WIN32
+    *buf = '\0';
+
+    // Get Thread Name
+    PWSTR pszThreadDescription = NULL;
+    HRESULT hr = GetThreadDescription(GetCurrentThread(), &pszThreadDescription);
+    if (FAILED(hr)) {
+        return -1;
+    }
+
+    // Convert to UTF-8
+    int szLength =
+        WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, pszThreadDescription,
+                            -1, NULL, 0, NULL, NULL);
+    if (szLength) {
+        char *buffer = calloc(szLength + 1, sizeof(char));
+        WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, pszThreadDescription,
+                            -1, buffer, szLength, NULL, NULL);
+        memcpy(buf, buffer, length - 1);
+        buf[MIN(szLength, length - 1)] = '\0';
+        free(buffer);
+    }
+
+    // Free Result
+    LocalFree(pszThreadDescription);
+
+    return 0;
 #endif
     return -1;
 }
@@ -1527,9 +1538,15 @@ CF_EXPORT char **_CFEnviron(void) {
 #endif
 }
 
+#if TARGET_OS_WIN32
+CF_CROSS_PLATFORM_EXPORT int _CFOpenFileWithMode(const unsigned short *path, int opts, mode_t mode) {
+    return _wopen(path, opts, mode);
+}
+#else
 CF_CROSS_PLATFORM_EXPORT int _CFOpenFileWithMode(const char *path, int opts, mode_t mode) {
     return open(path, opts, mode);
 }
+#endif
 
 int _CFOpenFile(const char *path, int opts) {
     return open(path, opts, 0);

CoreFoundation/Base.subproj/CoreFoundation_Prefix.h

@@ -219,6 +219,8 @@ CF_INLINE uint64_t mach_absolute_time() {
     return (uint64_t)ts.tv_nsec + (uint64_t)ts.tv_sec * 1000000000UL;
 #endif
 }
+
+#define malloc_default_zone() (void *)0
 #endif // TARGET_OS_LINUX || TARGET_OS_BSD || TARGET_OS_WIN32
 
 #if TARGET_OS_LINUX || TARGET_OS_WIN32 || defined(__OpenBSD__)
@@ -268,9 +270,6 @@ typedef unsigned long fd_mask;
 CF_INLINE size_t malloc_size(void *memblock) {
     return malloc_usable_size(memblock);
 }
-
-#define malloc_default_zone() (void *)0
-
 #endif
 
 #if TARGET_OS_BSD
@@ -324,7 +323,6 @@ CF_EXPORT int _NS_access(const char *name, int amode);
 
 #define __PRETTY_FUNCTION__ __FUNCTION__
 
-#define malloc_default_zone() (void *)0
 #define malloc_zone_from_ptr(a) (void *)0
 #define malloc_zone_malloc(zone,size) malloc(size)
 #define malloc_zone_memalign(zone,align,size) malloc(size)

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -293,13 +293,13 @@ struct _NSCFXMLBridge {
   _Null_unspecified CFMutableArrayRef (* _Nonnull CFArrayCreateMutable)(CFAllocatorRef _Nullable, CFIndex, const CFArrayCallBacks *_Nullable);
   void (* _Nonnull CFArrayAppendValue)(CFMutableArrayRef, const void *);
   CFIndex (* _Nonnull CFDataGetLength)(CFDataRef);
-  uint8_t * _Null_unspecified (* _Nonnull CFDataGetBytePtr)(CFDataRef);
+  const uint8_t * _Null_unspecified (* _Nonnull CFDataGetBytePtr)(CFDataRef);
   _Null_unspecified CFMutableDictionaryRef (* _Nonnull CFDictionaryCreateMutable)(CFAllocatorRef _Nullable, CFIndex, const CFDictionaryKeyCallBacks *, const CFDictionaryValueCallBacks *);
   void (* _Nonnull CFDictionarySetValue)(CFMutableDictionaryRef, const void * _Null_Unspecified, const void * _Null_unspecified);
-  _Null_unspecified CFAllocatorRef * _Nonnull kCFAllocatorSystemDefault;
-  _Null_unspecified CFAllocatorRef * _Nonnull kCFAllocatorNull;
-  CFDictionaryKeyCallBacks * _Nonnull kCFCopyStringDictionaryKeyCallBacks;
-  CFDictionaryValueCallBacks * _Nonnull kCFTypeDictionaryValueCallBacks;
+  const _Null_unspecified CFAllocatorRef * _Nonnull kCFAllocatorSystemDefault;
+  const _Null_unspecified CFAllocatorRef * _Nonnull kCFAllocatorNull;
+  const CFDictionaryKeyCallBacks * _Nonnull kCFCopyStringDictionaryKeyCallBacks;
+  const CFDictionaryValueCallBacks * _Nonnull kCFTypeDictionaryValueCallBacks;
   _Null_unspecified const CFStringRef * _Nonnull kCFErrorLocalizedDescriptionKey;
 };
 
@@ -480,7 +480,11 @@ CF_CROSS_PLATFORM_EXPORT CFIndex __CFCharDigitValue(UniChar ch);
 
 #pragma mark - File Functions
 
+#if TARGET_OS_WIN32
+CF_CROSS_PLATFORM_EXPORT int _CFOpenFileWithMode(const unsigned short *path, int opts, mode_t mode);
+#else
 CF_CROSS_PLATFORM_EXPORT int _CFOpenFileWithMode(const char *path, int opts, mode_t mode);
+#endif
 CF_CROSS_PLATFORM_EXPORT void *_CFReallocf(void *ptr, size_t size);
 CF_CROSS_PLATFORM_EXPORT int _CFOpenFile(const char *path, int opts);
 

CoreFoundation/Base.subproj/SymbolAliases

@@ -98,8 +98,3 @@ _kCFNumberFormatterZeroSymbolKey		_kCFNumberFormatterZeroSymbol
 _kCFNumberFormatterUsesCharacterDirectionKey	_kCFNumberFormatterUsesCharacterDirection
 _kCFDateFormatterUsesCharacterDirectionKey	_kCFDateFormatterUsesCharacterDirection
 _kCFDateFormatterCalendarIdentifierKey		_kCFDateFormatterCalendarName
-
-# Workaround for being able to compile with a swift compiler with the old mangling prefix $S.
-# This can eventually be removed if everyone compiles with the ABI-stable Swift 5.0 compiler.
-_$S15SwiftFoundation19_NSCFConstantStringCN	_$s15SwiftFoundation19_NSCFConstantStringCN
-

CoreFoundation/CMakeLists.txt

@@ -22,7 +22,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE YES)
 
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 set(THREADS_PREFER_PTHREAD_FLAG OFF)
-find_package(Threads)
+find_package(Threads REQUIRED)
 
 if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
   find_package(LibXml2 REQUIRED)
@@ -398,6 +398,16 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
     ICU::i18n)
 endif()
 
+if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
+  if((NS_CURL_ASSUME_FEATURES_MISSING) OR (CURL_VERSION_STRING VERSION_LESS "7.32.0"))
+    add_compile_definitions($<$<COMPILE_LANGUAGE:C>:NS_CURL_MISSING_XFERINFOFUNCTION>)
+  endif()
+
+  if((NS_CURL_ASSUME_FEATURES_MISSING) OR (CURL_VERSION_STRING VERSION_LESS "7.30.0"))
+    add_compile_definitions($<$<COMPILE_LANGUAGE:C>:NS_CURL_MISSING_MAX_HOST_CONNECTIONS>)
+  endif()
+endif()
+
 add_framework(CFURLSessionInterface
                 ${FRAMEWORK_LIBRARY_TYPE}
               FRAMEWORK_DIRECTORY

CoreFoundation/Collections.subproj/CFBasicHash.c

@@ -1442,6 +1442,7 @@ CF_PRIVATE size_t CFBasicHashGetSize(CFConstBasicHashRef ht, Boolean total) {
     if (ht->bits.keys_offset) size += sizeof(CFBasicHashValue *);
     if (ht->bits.counts_offset) size += sizeof(void *);
     if (__CFBasicHashHasHashCache(ht)) size += sizeof(uintptr_t *);
+#if ENABLE_MEMORY_COUNTERS || ENABLE_DTRACE_PROBES
     if (total) {
         CFIndex num_buckets = __CFBasicHashTableSizes[ht->bits.num_buckets_idx];
         if (0 < num_buckets) {
@@ -1451,6 +1452,9 @@ CF_PRIVATE size_t CFBasicHashGetSize(CFConstBasicHashRef ht, Boolean total) {
             if (__CFBasicHashHasHashCache(ht)) size += malloc_size(__CFBasicHashGetHashes(ht));
         }
     }
+#else
+    (void)total;
+#endif
     return size;
 }
 

CoreFoundation/Collections.subproj/CFStorage.c

@@ -1366,21 +1366,6 @@ static void __CFStorageApplyNodeBlock(CFStorageRef storage, void (^block)(CFStor
     __CFStorageApplyNodeBlockInterior(storage, &storage->rootNode, block);
 }
 
-static CFIndex __CFStorageEstimateTotalAllocatedSize(CFStorageRef storage) __attribute__((unused));
-static CFIndex __CFStorageEstimateTotalAllocatedSize(CFStorageRef storage) {
-    __block CFIndex nodeResult = 0;
-    __block CFIndex contentsResult = 0;
-    __CFStorageApplyNodeBlock(storage, ^(CFStorageRef storage, CFStorageNode *node) {
-	if (node != &storage->rootNode) {
-	    nodeResult += malloc_size(node);
-	    if (node->isLeaf && node->info.leaf.memory != NULL) {
-		contentsResult += malloc_size(node->info.leaf.memory);
-	    }
-	}
-    });
-    return nodeResult + contentsResult;
-}
-
 void __CFStorageSetAlwaysFrozen(CFStorageRef storage, bool alwaysFrozen) {
     storage->alwaysFrozen = alwaysFrozen;
 }