Skip to content

Commit 7b99da4

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Revert "Merge branch 'PHP-8.3' into PHP-8.4"
2 parents 81779c2 + 83ca374 commit 7b99da4

File tree

3 files changed

+0
-13
lines changed

3 files changed

+0
-13
lines changed

ext/opcache/ZendAccelerator.c

-2
Original file line numberDiff line numberDiff line change
@@ -3282,8 +3282,6 @@ static zend_result accel_post_startup(void)
32823282
zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Could not enable JIT: could not use reserved buffer!");
32833283
} else {
32843284
zend_jit_startup(ZSMMG(reserved), jit_size, reattached);
3285-
} else {
3286-
zend_jit_startup_ok = true;
32873285
}
32883286
}
32893287
#endif

ext/opcache/jit/zend_jit.c

-9
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ zend_jit_globals jit_globals;
6969
#define JIT_STUB_PREFIX "JIT$$"
7070
#define TRACE_PREFIX "TRACE-"
7171

72-
bool zend_jit_startup_ok = false;
73-
7472
zend_ulong zend_jit_profile_counter = 0;
7573
int zend_jit_profile_counter_rid = -1;
7674

@@ -3774,13 +3772,6 @@ static void zend_jit_reset_counters(void)
37743772

37753773
void zend_jit_activate(void)
37763774
{
3777-
#ifdef ZTS
3778-
if (!zend_jit_startup_ok) {
3779-
JIT_G(enabled) = 0;
3780-
JIT_G(on) = 0;
3781-
return;
3782-
}
3783-
#endif
37843775
zend_jit_profile_counter = 0;
37853776
if (JIT_G(on)) {
37863777
if (JIT_G(trigger) == ZEND_JIT_ON_HOT_COUNTERS) {

ext/opcache/jit/zend_jit.h

-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ typedef struct _zend_jit_trace_rec zend_jit_trace_rec;
100100
typedef struct _zend_jit_trace_stack_frame zend_jit_trace_stack_frame;
101101
typedef struct _sym_node zend_sym_node;
102102

103-
extern bool zend_jit_startup_ok;
104-
105103
typedef struct _zend_jit_globals {
106104
bool enabled;
107105
bool on;

0 commit comments

Comments
 (0)