Skip to content

Commit 23391f1

Browse files
committed
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
2 parents 58b34fb + d3992b6 commit 23391f1

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

ext/opcache/jit/zend_jit.c

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

34503450
if (zend_execute_ex != execute_ex) {
3451-
if (strcmp(sapi_module.name, "phpdbg") != 0) {
3451+
if (zend_dtrace_enabled) {
3452+
zend_error(E_WARNING, "JIT is incompatible with DTrace. JIT disabled.");
3453+
} else if (strcmp(sapi_module.name, "phpdbg") != 0) {
34523454
zend_error(E_WARNING, "JIT is incompatible with third party extensions that override zend_execute_ex(). JIT disabled.");
34533455
}
34543456
JIT_G(enabled) = 0;

0 commit comments

Comments
 (0)