Skip to content

JIT: Fix TLS access with SHM reattachment #24355

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 2 commits into from
Oct 16, 2026
Merged

JIT: Fix TLS access with SHM reattachment #24355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18d3e56
JIT: Fix TLS access with SHM reattachment
arnaud-lb Oct 15, 2026
c431121
[ci skip] NEWS
arnaud-lb Oct 16, 2026
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 NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ PHP NEWS
in closures). (RV7PR)
. Fixed bug GH-24337 (JIT: segfault when decrementing a non-numeric string
property). (Lazizbek Ergashev)
. Fixed bug GH-24185 (Windows ZTS: random access violations with OPcache JIT
in multi-process setups). (Arnaud, ndossche)

- PDO:
. Fixed a duplicate warning when ATTR_STATEMENT_CLASS is rejected on a
Expand Down
5 changes: 5 additions & 0 deletions ext/opcache/jit/zend_jit_ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3412,6 +3412,10 @@ static void zend_jit_setup(bool reattached)
#endif

#ifdef ZTS
# ifdef ZEND_OPCACHE_SHM_REATTACHMENT
/* Different processes may load TLS variables in a different order, so we
* can not rely on offsets. We will fallback to runtime resolution. */
# else
zend_result result = zend_jit_resolve_tsrm_ls_cache_offsets(
&tsrm_ls_cache_tcb_offset,
&tsrm_tls_index,
Expand All @@ -3421,6 +3425,7 @@ static void zend_jit_setup(bool reattached)
zend_accel_error(ACCEL_LOG_INFO,
"Could not get _tsrm_ls_cache offsets, will fallback to runtime resolution");
}
# endif
#endif

#if !defined(ZEND_WIN32) && !defined(IR_TARGET_AARCH64)
Expand Down
Loading