Merge remote-tracking branch 'apple/master'

Author: manavgabhawala

CoreFoundation/Base.subproj/CFBase.c

@@ -875,15 +875,7 @@ void _CFRuntimeSetCFMPresent(void *addr) {
 
 
 extern void __HALT() {
-#if defined(__ppc__)
-    __asm__("trap");
-#elif defined(__i386__) || defined(__x86_64__)
-#if defined(_MSC_VER)
-    __asm int 3;
-#else
-    __asm__("int3");
-#endif
-#endif
+  __builtin_trap();
 }
 
 

CoreFoundation/Base.subproj/CFBase.h

@@ -80,7 +80,7 @@
 #include <stdbool.h>
 #endif
 
-  #if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) || (TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)
+  #if ((TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) || (TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) && !DEPLOYMENT_RUNTIME_SWIFT
     #include <libkern/OSTypes.h>
   #endif
 
@@ -124,6 +124,7 @@
     typedef UInt8                   UTF8Char;
 #endif
 
+
 #if !defined(CF_EXTERN_C_BEGIN)
 #if defined(__cplusplus)
 #define CF_EXTERN_C_BEGIN extern "C" {
@@ -231,14 +232,6 @@ CF_EXTERN_C_BEGIN
 #define CF_AUTOMATED_REFCOUNT_UNAVAILABLE
 #endif
 
-#if DEPLOYMENT_RUNTIME_SWIFT
-#ifndef CF_ASSUME_NONNULL_BEGIN
-#define CF_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
-#endif
-#ifndef CF_ASSUME_NONNULL_BEGIN
-#define CF_ASSUME_NONNULL_END   _Pragma("clang assume_nonnull end")
-#endif
-#endif
 
 #ifndef CF_IMPLICIT_BRIDGING_ENABLED
 #if __has_feature(arc_cf_code_audited)
@@ -647,9 +640,9 @@ void CFRelease(CFTypeRef cf);
 #else
 CF_EXPORT
 CFTypeRef CFAutorelease(CFTypeRef CF_RELEASES_ARGUMENT arg) CF_AVAILABLE(10_9, 7_0);
-#endif
 CF_EXPORT
 CFIndex CFGetRetainCount(CFTypeRef cf);
+#endif
 
 CF_EXPORT
 Boolean CFEqual(CFTypeRef cf1, CFTypeRef cf2);

CoreFoundation/Base.subproj/CFInternal.h

@@ -97,7 +97,7 @@ CF_EXTERN_C_BEGIN
 #include <CoreFoundation/CFLogUtilities.h>
 #include <CoreFoundation/CFRuntime.h>
 #include <limits.h>
-#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
 #include <xlocale.h>
 #include <unistd.h>
 #include <sys/time.h>
@@ -169,6 +169,14 @@ CF_PRIVATE CFIndex __CFActiveProcessorCount();
     #else
         #error Compiler not supported
     #endif
+#elif defined(__ppc__) || (__arm__)
+    #if defined(__GNUC__)
+        #define HALT do {asm __volatile__("trap"); kill(getpid(), 9); __builtin_unreachable(); } while (0)
+    #elif defined(_MSC_VER)
+        #define HALT do { DebugBreak(); abort(); __builtin_unreachable(); } while (0)
+    #else
+        #error Compiler not supported
+    #endif
 #endif
 
 #if defined(DEBUG)
@@ -495,7 +503,7 @@ CF_INLINE Boolean __CFLockTry(volatile CFLock_t *lock) {
     return (InterlockedCompareExchange((LONG volatile *)lock, ~0, 0) == 0);
 }
 
-#elif DEPLOYMENT_TARGET_LINUX
+#elif DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
 
 typedef int32_t CFLock_t;
 #define CFLockInit 0
@@ -654,6 +662,9 @@ CF_INLINE uintptr_t __CFISAForTypeID(CFTypeID typeID) {
     return (typeID < __CFRuntimeClassTableSize) ? __CFRuntimeObjCClassTable[typeID] : 0;
 }
 
+/* For Swift, which can't allocate any CF objects until after the bridge is initialized */
+CF_PRIVATE void __CFNumberInitialize(void);
+
 /* See comments in CFBase.c
 */
 #define FAULT_CALLBACK(V)
@@ -794,7 +805,7 @@ CF_EXPORT void _NS_pthread_setname_np(const char *name);
 #define pthread_setname_np _NS_pthread_setname_np
 #endif
 
-#if DEPLOYMENT_TARGET_WINDOWS
+#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
 // replacement for DISPATCH_QUEUE_OVERCOMMIT until we get a bug fix in dispatch on Windows
 // <rdar://problem/7923891> dispatch on Windows: Need queue_private.h
 #define DISPATCH_QUEUE_OVERCOMMIT 2
@@ -855,7 +866,6 @@ CF_INLINE long qos_class_main() {
 CF_INLINE long qos_class_self() {
 	return QOS_CLASS_DEFAULT;
 }
-
 #endif
 
 // Returns a generic dispatch queue for when you want to just throw some work

CoreFoundation/Base.subproj/CFLogUtilities.h

@@ -25,7 +25,7 @@
 CF_EXTERN_C_BEGIN
 
 
-enum {	// Legal level values for CFLog()
+typedef CF_ENUM(int32_t, CFLogLevel) {	// Legal level values for CFLog()
     kCFLogLevelEmergency = 0,
     kCFLogLevelAlert = 1,
     kCFLogLevelCritical = 2,
@@ -36,7 +36,7 @@ enum {	// Legal level values for CFLog()
     kCFLogLevelDebug = 7,
 };
 
-CF_EXPORT void CFLog(int32_t level, CFStringRef format, ...);
+CF_EXPORT void CFLog(CFLogLevel level, CFStringRef format, ...);
 /*	Passing in a level value which is outside the range of 0-7 will cause the the call to do nothing.
 	CFLog() logs the message using the asl.h API, and uses the level parameter as the log level.
 	Note that the asl subsystem ignores some log levels by default.
@@ -45,6 +45,10 @@ CF_EXPORT void CFLog(int32_t level, CFStringRef format, ...);
 	If you care about performance, you shouldn't be logging.
 */
 
+#if DEPLOYMENT_RUNTIME_SWIFT
+CF_EXPORT void CFLog1(CFLogLevel lev, CFStringRef message);
+#endif
+
 CF_EXTERN_C_END
 
 #endif /* ! __COREFOUNDATION_CFLOGUTILITIES__ */

CoreFoundation/Base.subproj/CFPlatform.c

@@ -563,7 +563,7 @@ CF_PRIVATE void __CFFinalizeWindowsThreadData() {
 #endif
 
 
-#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
 static pthread_key_t __CFTSDIndexKey;
 #endif
 
@@ -1062,7 +1062,7 @@ CF_PRIVATE int _NS_gettimeofday(struct timeval *tv, struct timezone *tz) {
 #pragma mark -
 #pragma mark Linux OSAtomic
 
-#if DEPLOYMENT_TARGET_LINUX
+#if defined(DEPLOYMENT_TARGET_LINUX) || defined(DEPLOYMENT_TARGET_FREEBSD)
 
 bool OSAtomicCompareAndSwapPtr(void *oldp, void *newp, void *volatile *dst) 
 { 
@@ -1272,6 +1272,18 @@ int _CFOpenFile(const char *path, int opts) {
 }
 #endif
 
+#if DEPLOYMENT_RUNTIME_SWIFT
+CF_PRIVATE char **_CFEnviron(void) {
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
+    return *_NSGetEnviron();
+#elif DEPLOYMENT_TARGET_WINDOWS
+    return _environ;
+#else
+    return environ;
+#endif
+}
+#endif
+
 void *_CFReallocf(void *ptr, size_t size) {
 #if DEPLOYMENT_TARGET_WINDOWS | DEPLOYMENT_TARGET_LINUX
     void *mem = realloc(ptr, size);

CoreFoundation/Base.subproj/CFPriv.h

@@ -563,9 +563,9 @@ CF_EXPORT CFMessagePortRef _CFMessagePortCreateLocalEx(CFAllocatorRef allocator,
 
 #endif
 
-#if TARGET_OS_MAC || TARGET_OS_EMBEDDED || TARGET_OS_IPHONE || TARGET_OS_LINUX
+#if TARGET_OS_MAC || TARGET_OS_EMBEDDED || TARGET_OS_IPHONE
 #include <pthread.h>
-#else
+#elif !TARGET_OS_LINUX
 // Avoid including the pthread header
 #ifndef HAVE_STRUCT_TIMESPEC
 #define HAVE_STRUCT_TIMESPEC 1

CoreFoundation/Base.subproj/CFRuntime.c

@@ -55,6 +55,8 @@ __kCFReleaseEvent = 29
 
 #if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
 #include <malloc.h>
+#elif DEPLOYMENT_TARGET_FREEBSD
+#include <stdlib.h> // malloc()
 #else
 #include <malloc/malloc.h>
 #endif
@@ -484,7 +486,7 @@ enum {
 #if DEPLOYMENT_TARGET_MACOSX
 #define NUM_EXTERN_TABLES 8
 #define EXTERN_TABLE_IDX(O) (((uintptr_t)(O) >> 8) & 0x7)
-#elif DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
+#elif DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
 #define NUM_EXTERN_TABLES 1
 #define EXTERN_TABLE_IDX(O) 0
 #else
@@ -722,11 +724,7 @@ static CFLock_t __CFRuntimeExternRefCountTableLock = CFLockInit;
 #endif
 
 #if DEPLOYMENT_RUNTIME_SWIFT
-CFIndex CFGetRetainCount(CFTypeRef cf) {
-    extern size_t swift_retainCount(void *object);
-    // size_t and CFIndex aren't really the same, but you are already playing with fire by calling this function.
-    return (CFIndex)swift_retainCount((void *)cf);
-}
+// using CFGetRetainCount is very dangerous; there is no real reason to use it in the swift version of CF.
 #else
 static uint64_t __CFGetFullRetainCount(CFTypeRef cf) {
     if (NULL == cf) { CRSetCrashLogMessage("*** __CFGetFullRetainCount() called with NULL ***"); HALT; }
@@ -988,7 +986,7 @@ CF_PRIVATE Boolean __CFInitialized = 0;
 // move the next 2 lines down into the #if below, and make it static, after Foundation gets off this symbol on other platforms
 CF_EXPORT pthread_t _CFMainPThread;
 pthread_t _CFMainPThread = kNilPthreadT;
-#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_IPHONESIMULATOR
+#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_IPHONESIMULATOR || DEPLOYMENT_TARGET_LINUX
 
 CF_EXPORT pthread_t _CF_pthread_main_thread_np(void);
 pthread_t _CF_pthread_main_thread_np(void) {
@@ -1137,7 +1135,7 @@ void __CFInitialize(void) {
 #if (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI) && !DEPLOYMENT_RUNTIME_SWIFT
         CFMachPortGetTypeID();
 #endif
-#if (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS) && !DEPLOYMENT_RUNTIME_SWIFT
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
         __CFStreamInitialize();
 #endif
 #if DEPLOYMENT_TARGET_WINDOWS
@@ -1161,6 +1159,7 @@ void __CFInitialize(void) {
 #endif
 #endif
 #if DEPLOYMENT_RUNTIME_SWIFT
+        _CFKeyedArchiverUIDGetTypeID();
         #ifndef __CFInitializeSwift
         #if TARGET_OS_LINUX
         #define __CFInitializeSwift _TF10Foundation19__CFInitializeSwiftFT_T_
@@ -1171,6 +1170,7 @@ void __CFInitialize(void) {
         extern void __CFInitializeSwift();
         __CFInitializeSwift();
 #endif
+        __CFNumberInitialize(); /* needs to happen after Swift bridge is initialized */
         {
             CFIndex idx, cnt = 0;
             char **args = NULL;
@@ -1811,8 +1811,11 @@ const char *_NSPrintForDebugger(void *cf) {
 #if DEPLOYMENT_RUNTIME_SWIFT
 
 // For CF functions with 'Get' semantics, the compiler currently assumes that the result is autoreleased and must be retained. It does so on all platforms by emitting a call to objc_retainAutoreleasedReturnValue. On Darwin, this is implemented by the ObjC runtime. On Linux, there is no runtime, and therefore we have to stub it out here ourselves. The compiler will eventually call swift_release to balance the retain below. This is a workaround until the compiler no longer emits this callout on Linux.
-CFTypeRef objc_retainAutoreleasedReturnValue(CFTypeRef cf) {
-    if (cf) return CFRetain(cf);
+void * objc_retainAutoreleasedReturnValue(void *obj) {
+    if (obj) {
+        swift_retain(obj);
+        return obj;
+    }
     else return NULL;
 }
 

CoreFoundation/Base.subproj/CFUUID.c

@@ -271,7 +271,7 @@ CFUUIDRef CFUUIDCreate(CFAllocatorRef alloc) {
         long rStatus = UuidCreate(&u);
         if (RPC_S_OK != rStatus && RPC_S_UUID_LOCAL_ONLY != rStatus) retval = 1;
         memmove(&bytes, &u, sizeof(bytes));
-#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
+#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_LINUX
         static Boolean useV1UUIDs = false, checked = false;
         uuid_t uuid;
         if (!checked) {

CoreFoundation/Base.subproj/CFUtilities.c

@@ -309,12 +309,13 @@ static CFStringRef copySystemVersionPath(CFStringRef suffix) {
     if (!simulatorRoot) simulatorRoot = "/";
     return CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("%s%@"), simulatorRoot, suffix);
 #else
-    return suffix;
+    return CFStringCreateCopy(kCFAllocatorSystemDefault, suffix);
 #endif
 }
 
 
 CFDictionaryRef _CFCopySystemVersionDictionary(void) {
+    // TODO: Populate this dictionary differently on non-Darwin platforms
     CFStringRef path = copySystemVersionPath(CFSTR("/System/Library/CoreServices/SystemVersion.plist"));
     CFPropertyListRef plist = _CFCopyVersionDictionary(path);
     CFRelease(path);
@@ -605,7 +606,7 @@ static void __CFLogCString(int32_t lev, const char *message, size_t length, char
     char *uid = NULL;
     int bannerLen;
     bannerLen = 0;
-#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
     // The banner path may use CF functions, but the rest of this function should not. It may be called at times when CF is not fully setup or torn down.
     if (withBanner) {
 	double dummy;
@@ -753,14 +754,19 @@ CF_PRIVATE void _CFLogSimple(int32_t lev, char *format, ...) {
     va_end(args);
 }
 
-void CFLog(int32_t lev, CFStringRef format, ...) {
+void CFLog(CFLogLevel lev, CFStringRef format, ...) {
     va_list args;
     va_start(args, format); 
     _CFLogvEx3(NULL, NULL, NULL, NULL, lev, format, args, __builtin_return_address(0));
     va_end(args);
 }
 
-
+#if DEPLOYMENT_RUNTIME_SWIFT
+// Temporary as Swift cannot import varag C functions
+void CFLog1(CFLogLevel lev, CFStringRef message) {
+    CFLog(lev, CFSTR("%@"), message);
+}
+#endif
 
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
 
@@ -1081,7 +1087,7 @@ CF_PRIVATE Boolean _CFReadMappedFromFile(CFStringRef path, Boolean map, Boolean
     if (0LL == statBuf.st_size) {
         bytes = malloc(8); // don't return constant string -- it's freed!
 	length = 0;
-#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
     } else if (map) {
         if((void *)-1 == (bytes = mmap(0, (size_t)statBuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0))) {
 	    int32_t savederrno = errno;
@@ -1255,6 +1261,9 @@ CFDictionaryRef __CFGetEnvironment() {
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
         extern char ***_NSGetEnviron();
         char **envp = *_NSGetEnviron();
+#elif DEPLOYMENT_TARGET_FREEBSD
+        extern char **environ;
+        char **envp = environ;
 #elif DEPLOYMENT_TARGET_LINUX
 #ifndef environ
 #define environ __environ