Merge remote-tracking branch 'upstream/master'

Author: krzyzanowskim

CoreFoundation/Base.subproj/CFRuntime.c

@@ -1808,7 +1808,7 @@ const char *_NSPrintForDebugger(void *cf) {
     }
 }
 
-#if DEPLOYMENT_RUNTIME_SWIFT && DEPLOYMENT_TARGET_LINUX
+#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) {

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -19,6 +19,7 @@
 #include <fts.h>
 
 CF_ASSUME_NONNULL_BEGIN
+CF_IMPLICIT_BRIDGING_ENABLED
 
 struct __CFSwiftObject {
     uintptr_t isa;
@@ -209,6 +210,7 @@ extern void _CFURLInitWithFileSystemPathRelativeToBase(CFURLRef url, CFStringRef
 extern Boolean _CFURLInitWithURLString(CFURLRef url, CFStringRef string, Boolean checkForLegalCharacters, _Nullable CFURLRef baseURL);
 extern Boolean _CFURLInitAbsoluteURLWithBytes(CFURLRef url, const UInt8 *relativeURLBytes, CFIndex length, CFStringEncoding encoding, _Nullable CFURLRef baseURL);
 
+extern CFHashCode CFHashBytes(uint8_t *bytes, CFIndex length);
 extern CFIndex __CFProcessorCount();
 extern uint64_t __CFMemorySize();
 extern CFIndex __CFActiveProcessorCount();
@@ -271,6 +273,7 @@ extern void _cf_uuid_unparse(const _cf_uuid_t uu, _cf_uuid_string_t out);
 extern void _cf_uuid_unparse_lower(const _cf_uuid_t uu, _cf_uuid_string_t out);
 extern void _cf_uuid_unparse_upper(const _cf_uuid_t uu, _cf_uuid_string_t out);
 
+CF_IMPLICIT_BRIDGING_DISABLED
 CF_ASSUME_NONNULL_END
 
 #endif /* __COREFOUNDATION_FORSWIFTFOUNDATIONONLY__ */

CoreFoundation/Locale.subproj/CFCalendar.c

@@ -49,10 +49,10 @@ static CFStringRef __CFCalendarCopyDescription(CFTypeRef cf) {
 
 static void __CFCalendarDeallocate(CFTypeRef cf) {
     CFCalendarRef calendar = (CFCalendarRef)cf;
-    CFRelease(calendar->_identifier);
+    if (calendar->_identifier) CFRelease(calendar->_identifier);
     if (calendar->_locale) CFRelease(calendar->_locale);
     if (calendar->_localeID) CFRelease(calendar->_localeID);
-    CFRelease(calendar->_tz);
+    if (calendar->_tz) CFRelease(calendar->_tz);
     if (calendar->_cal) ucal_close(calendar->_cal);
 }
 
@@ -236,15 +236,14 @@ CFCalendarRef CFCalendarCopyCurrent(void) {
 }
 
 Boolean _CFCalendarInitWithIdentifier(CFCalendarRef calendar, CFStringRef identifier) {
-    if (identifier != kCFGregorianCalendar && identifier != kCFBuddhistCalendar && identifier != kCFJapaneseCalendar && identifier != kCFIslamicCalendar && identifier != kCFIslamicCivilCalendar && identifier != kCFHebrewCalendar) {
-        //    if (identifier != kCFGregorianCalendar && identifier != kCFBuddhistCalendar && identifier != kCFJapaneseCalendar && identifier != kCFIslamicCalendar && identifier != kCFIslamicCivilCalendar && identifier != kCFHebrewCalendar && identifier != kCFChineseCalendar) {
+    if (identifier != kCFGregorianCalendar && identifier != kCFBuddhistCalendar && identifier != kCFJapaneseCalendar && identifier != kCFIslamicCalendar && identifier != kCFIslamicCivilCalendar && identifier != kCFHebrewCalendar && identifier != kCFChineseCalendar) {
         if (CFEqual(kCFGregorianCalendar, identifier)) identifier = kCFGregorianCalendar;
         else if (CFEqual(kCFBuddhistCalendar, identifier)) identifier = kCFBuddhistCalendar;
         else if (CFEqual(kCFJapaneseCalendar, identifier)) identifier = kCFJapaneseCalendar;
         else if (CFEqual(kCFIslamicCalendar, identifier)) identifier = kCFIslamicCalendar;
         else if (CFEqual(kCFIslamicCivilCalendar, identifier)) identifier = kCFIslamicCivilCalendar;
         else if (CFEqual(kCFHebrewCalendar, identifier)) identifier = kCFHebrewCalendar;
-        //	else if (CFEqual(kCFChineseCalendar, identifier)) identifier = kCFChineseCalendar;
+        else if (CFEqual(kCFChineseCalendar, identifier)) identifier = kCFChineseCalendar;
         else return false;
     }
 
@@ -261,15 +260,14 @@ CFCalendarRef CFCalendarCreateWithIdentifier(CFAllocatorRef allocator, CFStringR
     __CFGenericValidateType(allocator, CFAllocatorGetTypeID());
     __CFGenericValidateType(identifier, CFStringGetTypeID());
     // return NULL until Chinese calendar is available
-    if (identifier != kCFGregorianCalendar && identifier != kCFBuddhistCalendar && identifier != kCFJapaneseCalendar && identifier != kCFIslamicCalendar && identifier != kCFIslamicCivilCalendar && identifier != kCFHebrewCalendar) {
-//    if (identifier != kCFGregorianCalendar && identifier != kCFBuddhistCalendar && identifier != kCFJapaneseCalendar && identifier != kCFIslamicCalendar && identifier != kCFIslamicCivilCalendar && identifier != kCFHebrewCalendar && identifier != kCFChineseCalendar) {
+    if (identifier != kCFGregorianCalendar && identifier != kCFBuddhistCalendar && identifier != kCFJapaneseCalendar && identifier != kCFIslamicCalendar && identifier != kCFIslamicCivilCalendar && identifier != kCFHebrewCalendar && identifier != kCFChineseCalendar) {
 	if (CFEqual(kCFGregorianCalendar, identifier)) identifier = kCFGregorianCalendar;
 	else if (CFEqual(kCFBuddhistCalendar, identifier)) identifier = kCFBuddhistCalendar;
 	else if (CFEqual(kCFJapaneseCalendar, identifier)) identifier = kCFJapaneseCalendar;
 	else if (CFEqual(kCFIslamicCalendar, identifier)) identifier = kCFIslamicCalendar;
 	else if (CFEqual(kCFIslamicCivilCalendar, identifier)) identifier = kCFIslamicCivilCalendar;
 	else if (CFEqual(kCFHebrewCalendar, identifier)) identifier = kCFHebrewCalendar;
-//	else if (CFEqual(kCFChineseCalendar, identifier)) identifier = kCFChineseCalendar;
+	else if (CFEqual(kCFChineseCalendar, identifier)) identifier = kCFChineseCalendar;
 	else return NULL;
     }
     struct __CFCalendar *calendar = NULL;
@@ -422,6 +420,7 @@ static UCalendarDateFields __CFCalendarGetICUFieldCodeFromChar(char ch) {
     case 'G': return UCAL_ERA;
     case 'y': return UCAL_YEAR;
     case 'M': return UCAL_MONTH;
+    case 'l': return UCAL_IS_LEAP_MONTH;
     case 'd': return UCAL_DAY_OF_MONTH;
     case 'h': return UCAL_HOUR;
     case 'H': return UCAL_HOUR_OF_DAY;

CoreFoundation/NumberDate.subproj/CFNumber.c

@@ -1099,6 +1099,7 @@ static inline void _CFNumberInit(CFNumberRef result, CFNumberType type, const vo
         case kCFNumberFloat32Type: memmove((void *)&result->_pad, valuePtr, 4); break;
         case kCFNumberFloat64Type: memmove((void *)&result->_pad, valuePtr, 8); break;
     }
+    __CFBitfieldSetValue(((struct __CFNumber *)result)->_base._cfinfo[CF_INFO_BITS], 4, 0, (uint8_t)__CFNumberTypeTable[type].canonicalType);
 }
 
 CF_EXPORT void _CFNumberInitBool(CFNumberRef result, Boolean value) {

CoreFoundation/Stream.subproj/CFConcreteStreams.c

@@ -592,21 +592,23 @@ static CFIndex dataRead(CFReadStreamRef stream, UInt8 *buffer, CFIndex bufferLen
 
 static const UInt8 *dataGetBuffer(CFReadStreamRef stream, CFIndex maxBytesToRead, CFIndex *numBytesRead, CFStreamError *error, Boolean *atEOF, void *info) {
     _CFReadDataStreamContext *dataCtxt = (_CFReadDataStreamContext *)info;
-    const UInt8 *bytes = CFDataGetBytePtr(dataCtxt->data);
-    if (dataCtxt->loc - bytes > maxBytesToRead) {
+    const UInt8 *bytePtr = CFDataGetBytePtr(dataCtxt->data);
+    CFIndex length = CFDataGetLength(dataCtxt->data);
+    CFIndex bytesToRead = bytePtr + length - dataCtxt->loc;
+    if (bytesToRead > maxBytesToRead) {
         *numBytesRead = maxBytesToRead;
         *atEOF = FALSE;
     } else {
-        *numBytesRead = dataCtxt->loc - bytes;
+        *numBytesRead = bytesToRead;
         *atEOF = TRUE;
     }
     error->error = 0;
-    bytes = dataCtxt->loc;
+    const UInt8 *buffer = dataCtxt->loc;
     dataCtxt->loc += *numBytesRead;
     if (dataCtxt->scheduled && !*atEOF) {
         CFReadStreamSignalEvent(stream, kCFStreamEventHasBytesAvailable, NULL);
     }
-    return bytes;
+    return buffer;
 }
 
 static Boolean dataCanRead(CFReadStreamRef stream, void *info) {

Docs/Design.md

@@ -13,6 +13,8 @@ In a very limited number of cases, key Foundation API as it exists on Apple plat
 
 A significant portion of the implementation of Foundation on Apple platforms is provided by another framework called CoreFoundation (a.k.a. CF). CF is written primarily in C and is very portable. Therefore we have chosen to use it for the internal implementation of Swift Foundation where possible. As CF is present on all platforms, we can use it to provide a common implementation everywhere.
 
+Another aspect of portability is keeping dependencies to an absolute minimum. With fewer dependencies to port, it is more likely that Foundation will be able to easily compile and run on new platforms. Therefore, we will prefer solutions that are implemented in Foundation itself. Exceptions can be made for major functionality (for example, `ICU`, `libdispatch`, and `libxml2`).
+
 ## A Taxonomy of Types
 
 A key to the internal design of the framework is the split between the CF implementation and Swift implementation of the Foundation classes. They can be organized into several categories.

Docs/GettingStarted.md

@@ -74,3 +74,11 @@ LD_LIBRARY_PATH=../build/Ninja-ReleaseAssert/foundation-linux-x86_64/Foundation/
 ```
 
 Just copy & paste the correct line.
+
+When new source files or flags are added to the `build.py` script, the project will need to be reconfigured in order for the build system to pick them up. The top-level `swift/utils/build-script` can be used, but for quicker iteration you can use the following command to limit the reconfiguration to just the Foundation project:
+
+```
+% ninja reconfigure
+% ninja
+```
+