summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2020-11-30 16:42:17 +0300
committerDmitry Stogov <dmitry@zend.com>2020-11-30 16:42:17 +0300
commita0baa09b99adf4f65792e26a8af461a8fa4c97dc (patch)
tree430e25d1ec2f46411a0be894eb58af2ae6a81dfc
parent4643c0aac5fa85e2959a1b2d2e57090ac4d6d739 (diff)
downloadphp-git-a0baa09b99adf4f65792e26a8af461a8fa4c97dc.tar.gz
Hide phpdbg/JIT incompatibility macro (JIT is disabled for phpdbg)
-rw-r--r--ext/opcache/jit/zend_jit.c6
1 files changed, 5 insertions, 1 deletions
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;
}