archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  Fix GH-16851: JIT_G(enabled) not set correctly on other threads
This commit is contained in:
Christoph M. Becker 2024-11-20 19:14:10 +01:00
commit ae62779386
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
4 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
NEWS
View file

@ -1,5 +1,11 @@
PHP NEWS PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.4.2
- Opcache:
. Fixed bug GH-16851 (JIT_G(enabled) not set correctly on other threads).
(dktapps)
21 Nov 2024, PHP 8.4.1 21 Nov 2024, PHP 8.4.1
- BcMath: - BcMath:

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!"); zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Could not enable JIT: could not use reserved buffer!");
} else { } else {
zend_jit_startup(ZSMMG(reserved), jit_size, reattached); zend_jit_startup(ZSMMG(reserved), jit_size, reattached);
} else {
zend_jit_startup_ok = true;
} }
} }
#endif #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 JIT_STUB_PREFIX "JIT$$"
#define TRACE_PREFIX "TRACE-" #define TRACE_PREFIX "TRACE-"
bool zend_jit_startup_ok = false;
zend_ulong zend_jit_profile_counter = 0; zend_ulong zend_jit_profile_counter = 0;
int zend_jit_profile_counter_rid = -1; int zend_jit_profile_counter_rid = -1;
@ -3634,6 +3636,13 @@ static void zend_jit_reset_counters(void)
void zend_jit_activate(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; zend_jit_profile_counter = 0;
if (JIT_G(on)) { if (JIT_G(on)) {
if (JIT_G(trigger) == ZEND_JIT_ON_HOT_COUNTERS) { 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 _zend_jit_trace_stack_frame zend_jit_trace_stack_frame;
typedef struct _sym_node zend_sym_node; typedef struct _sym_node zend_sym_node;
extern bool zend_jit_startup_ok;
typedef struct _zend_jit_globals { typedef struct _zend_jit_globals {
bool enabled; bool enabled;
bool on; bool on;