Reapply #2626.

Author: millenomi

CoreFoundation/Collections.subproj/CFBasicHash.c

@@ -1474,13 +1474,17 @@ CF_PRIVATE size_t CFBasicHashGetSize(CFConstBasicHashRef ht, Boolean total) {
     if (ht->bits.counts_offset) size += sizeof(void *);
     if (__CFBasicHashHasHashCache(ht)) size += sizeof(uintptr_t *);
     if (total) {
+#if ENABLE_MEMORY_COUNTERS || ENABLE_DTRACE_PROBES
         CFIndex num_buckets = __CFBasicHashTableSizes[ht->bits.num_buckets_idx];
         if (0 < num_buckets) {
             size += malloc_size(__CFBasicHashGetValues(ht));
             if (ht->bits.keys_offset) size += malloc_size(__CFBasicHashGetKeys(ht));
             if (ht->bits.counts_offset) size += malloc_size(__CFBasicHashGetCounts(ht));
             if (__CFBasicHashHasHashCache(ht)) size += malloc_size(__CFBasicHashGetHashes(ht));
         }
+#else
+        (void)total;
+#endif
     }
     return size;
 }

CoreFoundation/Collections.subproj/CFStorage.c

@@ -1381,21 +1381,6 @@ static void __CFStorageApplyNodeBlock(CFStorageRef storage, void (^block)(CFStor
     __CFStorageApplyNodeBlockInterior(storage, &storage->rootNode, block);
 }
 
-static CFIndex __CFStorageEstimateTotalAllocatedSize(CFStorageRef storage) __attribute__((unused));
-static CFIndex __CFStorageEstimateTotalAllocatedSize(CFStorageRef storage) {
-    __block CFIndex nodeResult = 0;
-    __block CFIndex contentsResult = 0;
-    __CFStorageApplyNodeBlock(storage, ^(CFStorageRef storage, CFStorageNode *node) {
-	if (node != &storage->rootNode) {
-	    nodeResult += malloc_size(node);
-	    if (node->isLeaf && node->info.leaf.memory != NULL) {
-		contentsResult += malloc_size(node->info.leaf.memory);
-	    }
-	}
-    });
-    return nodeResult + contentsResult;
-}
-
 void __CFStorageSetAlwaysFrozen(CFStorageRef storage, bool alwaysFrozen) {
     storage->alwaysFrozen = alwaysFrozen;
 }