Merge branch 'PHP-8.3'

* PHP-8.3:
  Fix GH-14550: No warning message when Zend DTrace is enabled that opcache.jit is implictly disabled
This commit is contained in:
Niels Dossche 2024-07-07 13:18:42 +02:00
commit 23391f1fe7
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5

View file

@ -3448,7 +3448,9 @@ ZEND_EXT_API int zend_jit_check_support(void)
}
if (zend_execute_ex != execute_ex) {
if (strcmp(sapi_module.name, "phpdbg") != 0) {
if (zend_dtrace_enabled) {
zend_error(E_WARNING, "JIT is incompatible with DTrace. JIT disabled.");
} else if (strcmp(sapi_module.name, "phpdbg") != 0) {
zend_error(E_WARNING, "JIT is incompatible with third party extensions that override zend_execute_ex(). JIT disabled.");
}
JIT_G(enabled) = 0;