From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 30 Nov 2020 13:42:17 +0000 (+0300)
Subject: Hide phpdbg/JIT incompatibility macro (JIT is disabled for phpdbg)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0baa09b99adf4f65792e26a8af461a8fa4c97dc;p=php

Hide phpdbg/JIT incompatibility macro (JIT is disabled for phpdbg)
---

diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
index 60086403aa..bcba053d16 100644
--- a/ext/opcache/jit/zend_jit.c
+++ b/ext/opcache/jit/zend_jit.c
@@ -16,6 +16,8 @@
    +----------------------------------------------------------------------+
 */
 
+#include "main/php.h"
+#include "main/SAPI.h"
 #include "php_version.h"
 #include <ZendAccelerator.h>
 #include "zend_shared_alloc.h"
@@ -4177,7 +4179,9 @@ ZEND_EXT_API int zend_jit_check_support(void)
 	}
 
 	if (zend_execute_ex != execute_ex) {
-		zend_error(E_WARNING, "JIT is incompatible with third party extensions that override zend_execute_ex(). JIT disabled.");
+		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;
 		return FAILURE;
 	}