summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2020-11-20 15:12:30 +0300
committerDmitry Stogov <dmitry@zend.com>2020-11-20 15:12:30 +0300
commitc8df28d276c25c6f5ad0f1ab2727804b32be8cfe (patch)
tree245d7f14edf2dd226a68c93ef4eff058cd9a081f /ext
parentc7343510e40c57b14111195e14bb31df3527db3f (diff)
downloadphp-git-c8df28d276c25c6f5ad0f1ab2727804b32be8cfe.tar.gz
Fixed 32-bit JIT
Diffstat (limited to 'ext')
-rw-r--r--ext/opcache/jit/zend_jit_disasm_x86.c2
-rw-r--r--ext/opcache/jit/zend_jit_helpers.c2
-rw-r--r--ext/opcache/jit/zend_jit_x86.dasc2
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/opcache/jit/zend_jit_disasm_x86.c b/ext/opcache/jit/zend_jit_disasm_x86.c
index 11335918cb..977e85e1cb 100644
--- a/ext/opcache/jit/zend_jit_disasm_x86.c
+++ b/ext/opcache/jit/zend_jit_disasm_x86.c
@@ -491,7 +491,7 @@ static int zend_jit_disasm_init(void)
REGISTER_HELPER(zend_jit_pre_dec_obj_helper);
REGISTER_HELPER(zend_jit_post_inc_obj_helper);
REGISTER_HELPER(zend_jit_post_dec_obj_helper);
-#if (PHP_VERSION_ID <= 80000) && (SIZEOF_SIZE_T == 4)
+#if (PHP_VERSION_ID <= 80100) && (SIZEOF_SIZE_T == 4)
REGISTER_HELPER(zval_jit_update_constant_ex);
#endif
REGISTER_HELPER(zend_jit_free_trampoline_helper);
diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c
index 7c164cd23b..9fd4bddf15 100644
--- a/ext/opcache/jit/zend_jit_helpers.c
+++ b/ext/opcache/jit/zend_jit_helpers.c
@@ -2639,7 +2639,7 @@ static void ZEND_FASTCALL zend_jit_post_dec_obj_helper(zend_object *zobj, zend_s
}
}
-#if (PHP_VERSION_ID <= 80000) && (SIZEOF_SIZE_T == 4)
+#if (PHP_VERSION_ID <= 80100) && (SIZEOF_SIZE_T == 4)
static zend_result ZEND_FASTCALL zval_jit_update_constant_ex(zval *p, zend_class_entry *scope)
{
if (Z_TYPE_P(p) == IS_CONSTANT_AST) {
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
index 1a590313c7..c979ea060d 100644
--- a/ext/opcache/jit/zend_jit_x86.dasc
+++ b/ext/opcache/jit/zend_jit_x86.dasc
@@ -12493,7 +12493,7 @@ static int zend_jit_recv_init(dasm_State **Dst, const zend_op *opline, const zen
| .if X64
| EXT_CALL zval_update_constant_ex, r0
| .else
- ||#if (PHP_VERSION_ID <= 80000)
+ ||#if (PHP_VERSION_ID < 80100) && (SIZEOF_SIZE_T == 4)
| EXT_CALL zval_jit_update_constant_ex, r0
||#else
| EXT_CALL zval_update_constant_ex, r0