1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Revert "Merge branch 'PHP-8.3' into PHP-8.4"

This reverts commit ae62779386, reversing
changes made to 19e685ecc4.

This was a bad merge; I'll have a look shortly.
This commit is contained in:
Christoph M. Becker
2024-11-20 19:45:36 +01:00
parent ae62779386
commit 83ca37483c
4 changed files with 0 additions and 19 deletions

6
NEWS
View File

@@ -1,11 +1,5 @@
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
- BcMath:

View File

@@ -3282,8 +3282,6 @@ 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

View File

@@ -69,8 +69,6 @@ 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;
@@ -3636,13 +3634,6 @@ 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) {

View File

@@ -100,8 +100,6 @@ 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;