Fix GH-14550: No warning message when Zend DTrace is enabled that opc…

…ache.jit is implictly disabled Closes GH-14847.
php · Jul 7, 2024 · b44ad27 · b44ad27
1 parent 0d4e0c0
commit b44ad27
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -4877,7 +4877,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;