Bring in new refcount representation.

Author: johnno1962

CoreFoundation/Base.subproj/CFBase.h

@@ -448,12 +448,6 @@ CF_EXPORT double kCFCoreFoundationVersionNumber;
 #define kCFCoreFoundationVersionNumber_iOS_9_x_Max 1299
 #endif
 
-#ifdef __ANDROID__
-typedef uint16_t _CFSwiftRCCount;
-#else
-typedef uint32_t _CFSwiftRCCount;
-#endif
-
 #if __LLP64__
 typedef unsigned long long CFTypeID;
 typedef unsigned long long CFOptionFlags;

CoreFoundation/Base.subproj/CFRuntime.c

@@ -384,11 +384,7 @@ CFTypeRef _CFRuntimeCreateInstance(CFAllocatorRef allocator, CFTypeID typeID, CF
     CFRuntimeClass *cls = __CFRuntimeClassTable[typeID];
     size_t align = (cls->version & _kCFRuntimeRequiresAlignment) ? cls->requiredAlignment : 16;
 
-#if DEPLOYMENT_TARGET_ANDROID
-    CFRuntimeBase *memory = (CFRuntimeBase *)swift_allocObject(isa, size + 4, align - 1);
-#else
     CFRuntimeBase *memory = (CFRuntimeBase *)swift_allocObject(isa, size, align - 1);
-#endif
 
     // Zero the rest of the memory, starting at cfinfo
     memset(&memory->_cfinfoa, 0, size - (sizeof(memory->_cfisa) + sizeof(memory->_swift_rc)));

CoreFoundation/NumberDate.subproj/CFTimeZone.c

@@ -813,6 +813,14 @@ static CFTimeZoneRef __CFTimeZoneCreateSystem(void) {
         CFRelease(name);
         if (result) return result;
     }
+#if DEPLOYMENT_TARGET_ANDROID
+    // Timezone database by name not available on Android.
+    // Approximate with gmtoff - could be general default.
+    struct tm info;
+    time_t now = time(NULL);
+    if (NULL != localtime_r(&now, &info))
+        return CFTimeZoneCreateWithTimeIntervalFromGMT(kCFAllocatorSystemDefault, info.tm_gmtoff);
+#endif
     return CFTimeZoneCreateWithTimeIntervalFromGMT(kCFAllocatorSystemDefault, 0.0);
 }
 

Foundation/FileManager.swift

@@ -375,10 +375,13 @@ open class FileManager : NSObject {
 
         This method replaces fileSystemAttributesAtPath:.
      */
+ #if os(Android)
+    @available(*, unavailable, message: "Unsuppported on this platform")
+    open func attributesOfFileSystem(forPath path: String) throws -> [FileAttributeKey : Any] {
+        NSUnsupported()
+    }
+ #else
     open func attributesOfFileSystem(forPath path: String) throws -> [FileAttributeKey : Any] {
-#if os(Android)
-        NSUnimplemented()
-#else
         // statvfs(2) doesn't support 64bit inode on Darwin (apfs), fallback to statfs(2)
         #if os(macOS) || os(iOS)
             var s = statfs()
@@ -407,8 +410,8 @@ open class FileManager : NSObject {
         result[.systemFreeNodes] = NSNumber(value: UInt64(s.f_ffree))
 
         return result
-#endif
     }
+#endif
 
     /* createSymbolicLinkAtPath:withDestination:error: returns YES if the symbolic link that point at 'destPath' was able to be created at the location specified by 'path'. If this method returns NO, the link was unable to be created and an NSError will be returned by reference in the 'error' parameter. This method does not traverse a terminal symlink.
 

Foundation/NSCFString.swift

@@ -71,8 +71,8 @@ internal final class _NSCFConstantString : _NSCFString {
         // FIXME: Split expression as a work-around for slow type
         //        checking (tracked by SR-5322).
         let offTemp1 = MemoryLayout<OpaquePointer>.size + MemoryLayout<uintptr_t>.size
-        let offTemp2 = MemoryLayout<_CFInfo>.size
-        return offTemp1 + offTemp2 + MemoryLayout<UnsafePointer<UInt8>>.size
+        let offset = offTemp1 + MemoryLayout<_CFInfo>.size
+        return offset + MemoryLayout<UnsafePointer<UInt8>>.size
     }
 
     private var _lenPtr :  UnsafeMutableRawPointer {

Foundation/NSCalendar.swift

@@ -130,7 +130,6 @@ open class NSCalendar : NSObject, NSCopying, NSSecureCoding {
     private var _localeID: UnsafeMutableRawPointer? = nil
     private var _tz: UnsafeMutableRawPointer? = nil
     private var _cal: UnsafeMutableRawPointer? = nil
-    private let __sizeofAdjustment = _CFPad()
 
     internal var _cfObject: CFType {
         return unsafeBitCast(self, to: CFCalendar.self)

Foundation/NSCharacterSet.swift

@@ -36,7 +36,6 @@ open class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSCoding {
     private var _buffer: UnsafeMutableRawPointer? = nil
     private var _length = CFIndex(0)
     private var _annex: UnsafeMutableRawPointer? = nil
-    private let __sizeofAdjustment = _CFPad()
 
     internal var _cfObject: CFType {
         return unsafeBitCast(self, to: CFType.self)

Foundation/NSData.swift

@@ -83,7 +83,6 @@ open class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
     private var _deallocator: UnsafeMutableRawPointer? = nil // for CF only
     private var _deallocHandler: _NSDataDeallocator? = _NSDataDeallocator() // for Swift
     private var _bytes: UnsafeMutablePointer<UInt8>? = nil
-    private let __sizeofAdjustment = _CFPad()
 
     internal var _cfObject: CFType {
         if type(of: self) === NSData.self || type(of: self) === NSMutableData.self {

Foundation/NSDate.swift

@@ -49,7 +49,6 @@ open class NSDate : NSObject, NSCopying, NSSecureCoding, NSCoding {
 
     internal let _base = _CFInfo(typeID: CFDateGetTypeID())
     internal let _timeIntervalSinceReferenceDate: TimeInterval
-    private let __sizeofAdjustment = _CFPad()
 
     open var timeIntervalSinceReferenceDate: TimeInterval {
         return _timeIntervalSinceReferenceDate

Foundation/NSKeyedArchiverHelpers.swift

@@ -19,7 +19,6 @@ internal class _NSKeyedArchiverUID : NSObject {
     typealias CFType = CFKeyedArchiverUID
     internal var _base = _CFInfo(typeID: _CFKeyedArchiverUIDGetTypeID())
     internal var value : UInt32 = 0
-    private let __sizeofAdjustment = _CFPad()
 
     internal var _cfObject : CFType {
         return unsafeBitCast(self, to: CFType.self)