Merge pull request #977 from NobodyNada/master

swift-ci · web-flow · commit b707ecf0dd53 · 2017-05-10T19:08:33.000-07:00
diff --git a/CoreFoundation/NumberDate.subproj/CFNumber.c b/CoreFoundation/NumberDate.subproj/CFNumber.c
@@ -1205,7 +1205,8 @@ CFNumberRef CFNumberCreate(CFAllocatorRef allocator, CFNumberType type, const vo
 	}
     }
 
-    CFIndex size = 8 + ((!__CFNumberTypeTable[type].floatBit && __CFNumberTypeTable[type].storageBit) ? 8 : 0);
+    CFIndex size = sizeof(struct __CFNumber) - sizeof(CFRuntimeBase);
+    if (!__CFNumberTypeTable[type].floatBit && __CFNumberTypeTable[type].storageBit) size += 8;
 #if OLD_CRAP_TOO
     size += 2 * sizeof(void *);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1205,7 +1205,8 @@ CFNumberRef CFNumberCreate(CFAllocatorRef allocator, CFNumberType type, const vo`
`1205`	`1205`	`}`
`1206`	`1206`	`}`
`1207`	`1207`
`1208`		`- CFIndex size = 8 + ((!__CFNumberTypeTable[type].floatBit && __CFNumberTypeTable[type].storageBit) ? 8 : 0);`
	`1208`	`+ CFIndex size = sizeof(struct __CFNumber) - sizeof(CFRuntimeBase);`
	`1209`	`+ if (!__CFNumberTypeTable[type].floatBit && __CFNumberTypeTable[type].storageBit) size += 8;`
`1209`	`1210`	`#if OLD_CRAP_TOO`
`1210`	`1211`	`size += 2 * sizeof(void *);`
`1211`	`1212`	`#endif`