Skip to content

Fix C++ build #24786

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
arnaud-lb merged 1 commit into from
Oct 27, 2026
+11 −4
Merged

Fix C++ build #24786

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions Zend/zend_portability.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ extern "C++" {
/* Make the atomic types used by Zend available to C++ extensions. */
using std::atomic_bool;
using std::atomic_int;
using std::atomic_thread_fence;
using std::memory_order_acquire;
}
#else
# if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L
Expand Down
13 changes: 9 additions & 4 deletions Zend/zend_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,11 +963,16 @@ static zend_always_inline uint32_t zend_gc_delref_ex(zend_refcounted_h *p, uint3
/* Fast class cache */
static zend_always_inline bool zstr_has_ce_cache(const zend_string *s)
{
static_assert(sizeof(_Atomic uint32_t) == sizeof(uint32_t), "atomic size");
static_assert(alignof(_Atomic uint32_t) == alignof(uint32_t), "atomic align");
static_assert(ATOMIC_INT_LOCK_FREE == 2, "not always lock-free");
#if defined(__cplusplus) || !defined(ATOMIC_INT_LOCK_FREE) || ATOMIC_INT_LOCK_FREE != 2
uint32_t type_info = *(const volatile uint32_t *)&GC_TYPE_INFO(s);
atomic_thread_fence(memory_order_acquire);
#else
static_assert(sizeof(_Atomic(uint32_t)) == sizeof(uint32_t), "atomic size");
static_assert(alignof(_Atomic(uint32_t)) == alignof(uint32_t), "atomic align");

uint32_t type_info = atomic_load_explicit((_Atomic(uint32_t) *)&GC_TYPE_INFO(s), memory_order_acquire);
#endif

uint32_t type_info = atomic_load_explicit((_Atomic uint32_t *)&GC_TYPE_INFO(s), memory_order_acquire);
return (type_info & (IS_STR_CLASS_NAME_MAP_PTR << GC_FLAGS_SHIFT)) != 0;
}

Expand Down
Loading