Skip to content

Commit d06cc8d

Browse files
authored
Merge pull request swiftlang#2788 from 3405691582/Catalina_Reapply2626
[CF] Reapply swiftlang#2626 (do not call malloc_size).
2 parents 2462fc4 + db61bb1 commit d06cc8d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

CoreFoundation/Collections.subproj/CFBasicHash.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,6 +1452,7 @@ CF_PRIVATE size_t CFBasicHashGetSize(CFConstBasicHashRef ht, Boolean total) {
14521452
if (ht->bits.keys_offset) size += sizeof(CFBasicHashValue *);
14531453
if (ht->bits.counts_offset) size += sizeof(void *);
14541454
if (__CFBasicHashHasHashCache(ht)) size += sizeof(uintptr_t *);
1455+
#if ENABLE_MEMORY_COUNTERS || ENABLE_DTRACE_PROBES
14551456
if (total) {
14561457
CFIndex num_buckets = __CFBasicHashTableSizes[ht->bits.num_buckets_idx];
14571458
if (0 < num_buckets) {
@@ -1461,6 +1462,9 @@ CF_PRIVATE size_t CFBasicHashGetSize(CFConstBasicHashRef ht, Boolean total) {
14611462
if (__CFBasicHashHasHashCache(ht)) size += malloc_size(__CFBasicHashGetHashes(ht));
14621463
}
14631464
}
1465+
#else
1466+
(void)total;
1467+
#endif
14641468
return size;
14651469
}
14661470

0 commit comments

Comments
 (0)