Skip to content

[5.7] Ensure libdispatch is always initialized before CoreFoundation #4672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2022
Merged

[5.7] Ensure libdispatch is always initialized before CoreFoundation #4672

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CoreFoundation/Base.subproj/CFRuntime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,10 +1171,20 @@ CF_EXPORT

CF_PRIVATE os_unfair_recursive_lock CFPlugInGlobalDataLock;

#if __HAS_DISPATCH__
extern void libdispatch_init();
#endif

void __CFInitialize(void) {
if (!__CFInitialized && !__CFInitializing) {
__CFInitializing = 1;

#if __HAS_DISPATCH__
// libdispatch has to be initialized before CoreFoundation, so to avoid
// issues with static initializer ordering, we are doing it explicitly.
libdispatch_init();
#endif

// This is a no-op on Darwin, but is needed on Linux and Windows.
_CFPerformDynamicInitOfOSRecursiveLock(&CFPlugInGlobalDataLock);

Expand Down