Fix CFInfo on 64-bit big endian platforms.

Prior to this change 64-bit platforms treated _cfinfoa as both a
64-bit and 32-bit variable. When accessing _cfinfoa as a 32-bit
variable the code makes the assumption that it is accessing the
lowest (or rightmost) bits of _cfinfoa. Unfortunately on big-endian
platforms it is actually accessing the high (or leftmost) bits.

Fix this issue by unconditionally treating _cfinfoa as a 64-bit
value when targeting a 64-bit platform.

Author: mundaym

CoreFoundation/Base.subproj/CFRuntime.c

@@ -388,12 +388,15 @@ CFTypeRef _CFRuntimeCreateInstance(CFAllocatorRef allocator, CFTypeID typeID, CF
 
     // Zero the rest of the memory, starting at cfinfo
     memset(&memory->_cfinfoa, 0, size - (sizeof(memory->_cfisa) + sizeof(memory->_swift_rc)));
-    
+
     // Set up the cfinfo struct
-    uint32_t *cfinfop = (uint32_t *)&(memory->_cfinfoa);
-    // The 0x80 means we use the default allocator
-    *cfinfop = (uint32_t)(((uint32_t)typeID << 8) | (0x80));
-    
+    uint32_t cfinfo = ((uint32_t)(typeID) << 8) | 0x80; // 0x80 means we use the default allocator
+#if __LP64__
+    *(uint64_t *)&(memory->_cfinfoa) = (uint64_t)cfinfo;
+#else
+    *(uint32_t *)&(memory->_cfinfoa) = cfinfo;
+#endif
+
     return memory;
 #else
     if (__CFRuntimeClassTableSize <= typeID) HALT;

CoreFoundation/String.subproj/CFString.h

@@ -176,17 +176,10 @@ struct __CFConstStr {
 #define CONST_STRING_LITERAL_SECTION
 #endif
 
-#if __BIG_ENDIAN__
-#define CFSTR(cStr)  ({ \
-    static struct __CFConstStr str CONST_STRING_LITERAL_SECTION = {{(uintptr_t)&__CFConstantStringClassReference, _CF_CONSTANT_OBJECT_STRONG_RC, 0x00000000C8070000}, (uint8_t *)(cStr), sizeof(cStr) - 1}; \
-    (CFStringRef)&str; \
-})
-#else
 #define CFSTR(cStr)  ({ \
     static struct __CFConstStr str CONST_STRING_LITERAL_SECTION = {{(uintptr_t)&__CFConstantStringClassReference, _CF_CONSTANT_OBJECT_STRONG_RC, 0x07C8}, (uint8_t *)(cStr), sizeof(cStr) - 1}; \
     (CFStringRef)&str; \
 })
-#endif
 
 #else
 

Foundation/NSObjCRuntime.swift

@@ -215,17 +215,33 @@ internal func NSInvalidArgument(_ message: String, method: String = #function, f
 
 internal struct _CFInfo {
     // This must match _CFRuntimeBase
+#if arch(x86_64) || arch(arm64) || arch(s390x) || arch(powerpc64) || arch(powerpc64le)
+    // 64-bit
+    var info: UInt64
+    init(typeID: CFTypeID) {
+        // This matches what _CFRuntimeCreateInstance does to initialize the info value
+        info = UInt64((UInt32(typeID) << 8) | 0x80)
+    }
+    init(typeID: CFTypeID, extra: UInt32) {
+        info = UInt64((UInt32(typeID) << 8) | 0x80)
+        info |= UInt64(extra) << 32
+    }
+#elseif arch(arm) || arch(i386)
+    // 32-bit
     var info: UInt32
     var pad : UInt32
     init(typeID: CFTypeID) {
         // This matches what _CFRuntimeCreateInstance does to initialize the info value
-        info = UInt32((UInt32(typeID) << 8) | (UInt32(0x80)))
+        info = (UInt32(typeID) << 8) | 0x80
         pad = 0
     }
     init(typeID: CFTypeID, extra: UInt32) {
-        info = UInt32((UInt32(typeID) << 8) | (UInt32(0x80)))
+        info = (UInt32(typeID) << 8) | 0x80
         pad = extra
     }
+#else
+#error("unknown architecture")
+#endif
 }
 
 #if os(macOS) || os(iOS)

Foundation/NSSwiftRuntime.swift

@@ -87,7 +87,13 @@ extension ObjCBool : CustomStringConvertible {
 #endif
 
 internal class __NSCFType : NSObject {
+#if arch(x86_64) || arch(arm64) || arch(s390x) || arch(powerpc64) || arch(powerpc64le)
+    private var _cfinfo : Int64
+#elseif arch(arm) || arch(i386)
     private var _cfinfo : Int32
+#else
+#error("unknown architecture")
+#endif
 
     override init() {
         // This is not actually called; _CFRuntimeCreateInstance will initialize _cfinfo