From 7e741a61ac91dfc95bf76b97829b9580394ae0dc Mon Sep 17 00:00:00 2001 From: Adam Thayer Date: Thu, 13 Sep 2018 08:30:39 -0700 Subject: [PATCH] Align __NSCFType with CFRuntimeBase / _CFInfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit __NSCFType has been using Int32 for _cfinfo. More recently in Swift 4, it’s been noticed that this can cause problems on 32-bit ARM and should be aligned with _CFInfo instead. --- Foundation/NSSwiftRuntime.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Foundation/NSSwiftRuntime.swift b/Foundation/NSSwiftRuntime.swift index 6d3c852727..7d8db72582 100644 --- a/Foundation/NSSwiftRuntime.swift +++ b/Foundation/NSSwiftRuntime.swift @@ -87,11 +87,11 @@ extension ObjCBool : CustomStringConvertible { #endif internal class __NSCFType : NSObject { - private var _cfinfo : Int32 + private var _cfinfo : _CFInfo override init() { // This is not actually called; _CFRuntimeCreateInstance will initialize _cfinfo - _cfinfo = 0 + _cfinfo = _CFInfo(typeID: 0) } override var hash: Int {