Skip to content

Commit f9375dc

Browse files
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Fix module shutdown crash during ZTS JIT shutdown
2 parents a00e4a3 + ae39069 commit f9375dc

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ext/opcache/jit/zend_jit.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4731,7 +4731,7 @@ static void zend_jit_globals_ctor(zend_jit_globals *jit_globals)
47314731
#ifdef ZTS
47324732
static void zend_jit_globals_dtor(zend_jit_globals *jit_globals)
47334733
{
4734-
zend_jit_trace_free_caches();
4734+
zend_jit_trace_free_caches(jit_globals);
47354735
}
47364736
#endif
47374737

@@ -5058,7 +5058,7 @@ ZEND_EXT_API void zend_jit_shutdown(void)
50585058
#ifdef ZTS
50595059
ts_free_id(jit_globals_id);
50605060
#else
5061-
zend_jit_trace_free_caches();
5061+
zend_jit_trace_free_caches(&jit_globals);
50625062
#endif
50635063
}
50645064

ext/opcache/jit/zend_jit_trace.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8396,10 +8396,10 @@ static void zend_jit_trace_reset_caches(void)
83968396
#endif
83978397
}
83988398

8399-
static void zend_jit_trace_free_caches(void)
8399+
static void zend_jit_trace_free_caches(zend_jit_globals *jit_globals)
84008400
{
8401-
if (JIT_G(exit_counters)) {
8402-
free(JIT_G(exit_counters));
8401+
if (jit_globals->exit_counters) {
8402+
free(jit_globals->exit_counters);
84038403
}
84048404
}
84058405

0 commit comments

Comments
 (0)