Fixed 32-bit JIT

diff --git a/ext/opcache/jit/zend_jit_disasm_x86.c b/ext/opcache/jit/zend_jit_disasm_x86.c
index 11335918cbac5436c52f2579bd5a73ab51cee455..977e85e1cb6f28bb82e94405a726d55f930e0064 100644 (file)
--- 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 7c164cd23ba8c6f8e18b1d6bd20fdc6c6a82068a..9fd4bddf1568e49cf7d8e21188785000edb97a28 100644 (file)
--- 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 1a590313c7a2dbc54a1e5ed83a1a3bb24f03bbb4..c979ea060d9f6a6bfe5a450b821dd65f94ad5f3a 100644 (file)
--- 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