Merge branch 'PHP-8.1' into PHP-8.2

dstogov · dstogov · commit d948b858decf · 2023-02-07T16:09:46.000+03:00
* PHP-8.1: 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
@@ -5061,7 +5061,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
`@@ -5061,7 +5061,9 @@ ZEND_EXT_API void zend_jit_shutdown(void)`
`5061`	`5061`	`zend_jit_perf_jitdump_close();`
`5062`	`5062`	`}`
`5063`	`5063`	`#endif`
`5064`		`-#ifndef ZTS`
	`5064`	`+#ifdef ZTS`
	`5065`	`+ ts_free_id(jit_globals_id);`
	`5066`	`+#else`
`5065`	`5067`	`zend_jit_trace_free_caches();`
`5066`	`5068`	`#endif`
`5067`	`5069`	`}`