Skip to content

Guard _create_instance_func with _constructing_mutex on shared-global (macOS hot-reload) builds #1991

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

Closed
reforia wants to merge 1 commit into from
Closed

Guard _create_instance_func with _constructing_mutex on shared-global (macOS hot-reload) builds #1991

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
16 changes: 15 additions & 1 deletion include/godot_cpp/core/class_db.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,27 @@ class ClassDB {
static GDExtensionObjectPtr _create_instance_func(void *data) {
#endif // GODOT_VERSION_MINOR >= 4
if constexpr (!std::is_abstract_v<T>) {
Wrapped::_set_construct_info<T>();
#if GODOT_VERSION_MINOR >= 4
#ifdef _GODOT_CPP_AVOID_THREAD_LOCAL
// When the construction state is a shared global rather than
// thread_local (macOS + hot reload), it must be guarded for the
// whole construction, mirroring _pre_initialize() (the memnew path).
// _postinitialize() releases the lock; when post-init is deferred we
// release it here to keep the recursive_mutex balanced.
Wrapped::_constructing_mutex.lock();
#endif
Wrapped::_set_construct_info<T>();
T *new_object = new ("", "") T;
if (p_notify_postinitialize) {
new_object->_postinitialize();
}
#ifdef _GODOT_CPP_AVOID_THREAD_LOCAL
else {
Wrapped::_constructing_mutex.unlock();
}
#endif
#else
Wrapped::_set_construct_info<T>();
T *new_object = memnew(T);
#endif // GODOT_VERSION_MINOR >= 4
return new_object->_owner;
Expand Down