diff --git a/NEWS b/NEWS index 8d85684e86b..cf7bd2515e4 100644 --- a/NEWS +++ b/NEWS @@ -16,6 +16,10 @@ PHP NEWS - LibXML: . Fixed bug GH-14563 (Build failure with libxml2 v2.13.0). (nielsdos) +- Opcache: + . Fixed bug GH-14550 (No warning message when Zend DTrace is enabled that + opcache.jit is implictly disabled). (nielsdos) + - Output: . Fixed bug GH-14808 (Unexpected null pointer in Zend/zend_string.h with empty output buffer). (nielsdos) diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c index aba71473583..e700e056a85 100644 --- a/ext/opcache/jit/zend_jit.c +++ b/ext/opcache/jit/zend_jit.c @@ -4895,7 +4895,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;