Skip to content

Commit b44ad27

Browse files
committed
Fix GH-14550: No warning message when Zend DTrace is enabled that opcache.jit is implictly disabled
Closes GH-14847.
1 parent 0d4e0c0 commit b44ad27

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ PHP NEWS
1616
- LibXML:
1717
. Fixed bug GH-14563 (Build failure with libxml2 v2.13.0). (nielsdos)
1818

19+
- Opcache:
20+
. Fixed bug GH-14550 (No warning message when Zend DTrace is enabled that
21+
opcache.jit is implictly disabled). (nielsdos)
22+
1923
- Output:
2024
. Fixed bug GH-14808 (Unexpected null pointer in Zend/zend_string.h with
2125
empty output buffer). (nielsdos)

ext/opcache/jit/zend_jit.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4877,7 +4877,9 @@ ZEND_EXT_API int zend_jit_check_support(void)
48774877
}
48784878

48794879
if (zend_execute_ex != execute_ex) {
4880-
if (strcmp(sapi_module.name, "phpdbg") != 0) {
4880+
if (zend_dtrace_enabled) {
4881+
zend_error(E_WARNING, "JIT is incompatible with DTrace. JIT disabled.");
4882+
} else if (strcmp(sapi_module.name, "phpdbg") != 0) {
48814883
zend_error(E_WARNING, "JIT is incompatible with third party extensions that override zend_execute_ex(). JIT disabled.");
48824884
}
48834885
JIT_G(enabled) = 0;

0 commit comments

Comments
 (0)