Merge pull request #2790 from 3405691582/Catalina_1708

swift-ci · web-flow · commit abcaf563a808 · 2020-05-13T12:56:53.000-07:00
diff --git a/CoreFoundation/Base.subproj/CFRuntime.c b/CoreFoundation/Base.subproj/CFRuntime.c
@@ -1650,7 +1650,7 @@ static void _CFRelease(CFTypeRef CF_RELEASES_ARGUMENT cf) {
             allocator = CFGetAllocator(cf);
             usesSystemDefaultAllocator = _CFAllocatorIsSystemDefault(allocator);
 
-            if (__kCFAllocatorTypeID_CONST != __CFGenericTypeID_inline(cf)) {
+            if (_kCFRuntimeIDCFAllocator != __CFGenericTypeID_inline(cf)) {
                 allocatorToRelease = (CFAllocatorRef _Nonnull)__CFGetAllocator(cf);
             }
 	}

Original file line number	Diff line number	Diff line change
`@@ -1650,7 +1650,7 @@ static void _CFRelease(CFTypeRef CF_RELEASES_ARGUMENT cf) {`
`1650`	`1650`	`allocator = CFGetAllocator(cf);`
`1651`	`1651`	`usesSystemDefaultAllocator = _CFAllocatorIsSystemDefault(allocator);`
`1652`	`1652`
`1653`		`- if (__kCFAllocatorTypeID_CONST != __CFGenericTypeID_inline(cf)) {`
	`1653`	`+ if (_kCFRuntimeIDCFAllocator != __CFGenericTypeID_inline(cf)) {`
`1654`	`1654`	`allocatorToRelease = (CFAllocatorRef _Nonnull)__CFGetAllocator(cf);`
`1655`	`1655`	`}`
`1656`	`1656`	`}`