mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 01:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source 
* PHP-8.4:
  Fix GH-16851: JIT_G(enabled) not set correctly on other threads
This commit is contained in:
Christoph M. Becker 2024-11-20 19:15:19 +01:00
commit 81779c2863
No known key found for this signature in database
GPG Key ID: D66C9593118BCCB6
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/opcache/ZendAccelerator.c
View File

@ -3282,6 +3282,8 @@ static zend_result accel_post_startup(void)
zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Could not enable JIT: could not use reserved buffer!");
} else {
zend_jit_startup(ZSMMG(reserved), jit_size, reattached);
} else {
zend_jit_startup_ok = true;
}
}
#endif

9
ext/opcache/jit/zend_jit.c
View File

@ -69,6 +69,8 @@ zend_jit_globals jit_globals;
#define JIT_STUB_PREFIX "JIT$$"
#define TRACE_PREFIX "TRACE-"
bool zend_jit_startup_ok = false;
zend_ulong zend_jit_profile_counter = 0;
int zend_jit_profile_counter_rid = -1;
@ -3772,6 +3774,13 @@ static void zend_jit_reset_counters(void)
void zend_jit_activate(void)
{
#ifdef ZTS
if (!zend_jit_startup_ok) {
JIT_G(enabled) = 0;
JIT_G(on) = 0;
return;
}
#endif
zend_jit_profile_counter = 0;
if (JIT_G(on)) {
if (JIT_G(trigger) == ZEND_JIT_ON_HOT_COUNTERS) {

2
ext/opcache/jit/zend_jit.h
View File

@ -100,6 +100,8 @@ typedef struct _zend_jit_trace_rec zend_jit_trace_rec;
typedef struct _zend_jit_trace_stack_frame zend_jit_trace_stack_frame;
typedef struct _sym_node zend_sym_node;
extern bool zend_jit_startup_ok;
typedef struct _zend_jit_globals {
bool enabled;
bool on;