Move __CFAllocatorRespectsHintZeroWhenAllocating to a CF-internal header to avoid confusion over its linkage. Resolves swiftlang#5125 (swiftlang#5126) (swiftlang#5127)

parkera · web-flow · commit 22af71d2143e · 2024-11-01T13:06:48.000-07:00
(cherry picked from commit b1b4603)
diff --git a/Sources/CoreFoundation/CFBase.c b/Sources/CoreFoundation/CFBase.c
@@ -790,7 +790,7 @@ void *__CFSafelyReallocateWithAllocator(CFAllocatorRef allocator, void *destinat
     return _CLANG_ANALYZER_IGNORE_NONNULL(reallocated);;
 }
 
-Boolean __CFAllocatorRespectsHintZeroWhenAllocating(CFAllocatorRef allocator) {
+CF_PRIVATE Boolean __CFAllocatorRespectsHintZeroWhenAllocating(CFAllocatorRef allocator) {
     return allocator == kCFAllocatorSystemDefault || allocator == kCFAllocatorMallocZone;
 }
 
diff --git a/Sources/CoreFoundation/include/ForFoundationOnly.h b/Sources/CoreFoundation/include/ForFoundationOnly.h
@@ -68,7 +68,6 @@ CF_EXPORT void *_Nonnull __CFSafelyReallocate(void * _Nullable destination, size
 CF_EXPORT void *_Nonnull __CFSafelyReallocateWithAllocator(CFAllocatorRef _Nullable, void * _Nullable destination, size_t newCapacity, CFOptionFlags options, void (^_Nullable reallocationFailureHandler)(void *_Nonnull original, bool *_Nonnull outRecovered));
 #endif
 
-Boolean __CFAllocatorRespectsHintZeroWhenAllocating(CFAllocatorRef _Nullable allocator);
 typedef CF_ENUM(CFOptionFlags, _CFAllocatorHint) {
     _CFAllocatorHintZeroWhenAllocating = 1
 };
diff --git a/Sources/CoreFoundation/include/ForSwiftFoundationOnly.h b/Sources/CoreFoundation/include/ForSwiftFoundationOnly.h
@@ -105,8 +105,6 @@
 
 _CF_EXPORT_SCOPE_BEGIN
 
-CF_PRIVATE Boolean __CFAllocatorRespectsHintZeroWhenAllocating(CFAllocatorRef _Nullable allocator);
-
 struct __CFSwiftObject {
     uintptr_t isa;
 };
diff --git a/Sources/CoreFoundation/internalInclude/CFInternal.h b/Sources/CoreFoundation/internalInclude/CFInternal.h
@@ -1057,6 +1057,8 @@ CF_INLINE CFAllocatorRef __CFGetAllocator(CFTypeRef cf) {	// !!! Use with CF typ
     return *(CFAllocatorRef *)((char *)cf - 16);
 }
 
+CF_PRIVATE Boolean __CFAllocatorRespectsHintZeroWhenAllocating(CFAllocatorRef allocator);
+
 /* !!! Avoid #importing objc.h; e.g. converting this to a .m file */
 struct __objcFastEnumerationStateEquivalent {
     unsigned long state;

Original file line number	Diff line number	Diff line change
`@@ -790,7 +790,7 @@ void __CFSafelyReallocateWithAllocator(CFAllocatorRef allocator, void destinat`
`790`	`790`	`return _CLANG_ANALYZER_IGNORE_NONNULL(reallocated);;`
`791`	`791`	`}`
`792`	`792`
`793`		`-Boolean __CFAllocatorRespectsHintZeroWhenAllocating(CFAllocatorRef allocator) {`
	`793`	`+CF_PRIVATE Boolean __CFAllocatorRespectsHintZeroWhenAllocating(CFAllocatorRef allocator) {`
`794`	`794`	`return allocator == kCFAllocatorSystemDefault \|\| allocator == kCFAllocatorMallocZone;`
`795`	`795`	`}`
`796`	`796`
Original file line number	Diff line number	Diff line change
`@@ -1057,6 +1057,8 @@ CF_INLINE CFAllocatorRef __CFGetAllocator(CFTypeRef cf) { // !!! Use with CF typ`
`1057`	`1057`	`return (CFAllocatorRef )((char *)cf - 16);`
`1058`	`1058`	`}`
`1059`	`1059`
	`1060`	`+CF_PRIVATE Boolean __CFAllocatorRespectsHintZeroWhenAllocating(CFAllocatorRef allocator);`
	`1061`	`+`
`1060`	`1062`	`/* !!! Avoid #importing objc.h; e.g. converting this to a .m file */`
`1061`	`1063`	`struct __objcFastEnumerationStateEquivalent {`
`1062`	`1064`	`unsigned long state;`