php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix GH-14550: No warning message when Zend DTrace is enabled that opcache.jit is implictly disabled

Browse Source 
Closes GH-14847.
This commit is contained in:
Niels Dossche
2024-07-06 21:39:32 +02:00
parent 0d4e0c013e
commit b44ad27a78
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -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)

4
ext/opcache/jit/zend_jit.c
View File

@@ -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;