Merge branch 'PHP-8.2'

dstogov · dstogov · commit 1521cafee29e · 2023-02-07T16:09:58.000+03:00
* PHP-8.2: ext/opcache/zend_jit: call TSRM dtor before unloading opcache.so (#10533)
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -5055,7 +5055,9 @@ ZEND_EXT_API void zend_jit_shutdown(void)
 		zend_jit_perf_jitdump_close();
 	}
 #endif
-#ifndef ZTS
+#ifdef ZTS
+	ts_free_id(jit_globals_id);
+#else
 	zend_jit_trace_free_caches();
 #endif
 }

Original file line number	Diff line number	Diff line change
`@@ -5055,7 +5055,9 @@ ZEND_EXT_API void zend_jit_shutdown(void)`
`5055`	`5055`	`zend_jit_perf_jitdump_close();`
`5056`	`5056`	`}`
`5057`	`5057`	`#endif`
`5058`		`-#ifndef ZTS`
	`5058`	`+#ifdef ZTS`
	`5059`	`+ ts_free_id(jit_globals_id);`
	`5060`	`+#else`
`5059`	`5061`	`zend_jit_trace_free_caches();`
`5060`	`5062`	`#endif`
`5061`	`5063`	`}`