diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-10-27 12:59:35 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-10-27 12:59:35 +0300 |
| commit | 45e2b9a7dd2934f362b4e6073c388c525cd8ebd1 (patch) | |
| tree | bf3be33364eb5aa55a1d421001b729f131837587 | |
| parent | 682357c5b488e5e57bd0272abd74a1512fc7e452 (diff) | |
| download | php-git-45e2b9a7dd2934f362b4e6073c388c525cd8ebd1.tar.gz | |
Fixed support for typed references
| -rw-r--r-- | ext/opcache/jit/zend_jit_x86.dasc | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index 3d25ada5f1..d2d5f7eaf5 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -12739,10 +12739,19 @@ static int zend_jit_fetch_obj(dasm_State **Dst, } } else if (flags == ZEND_FETCH_REF) { | IF_TYPE dl, IS_REFERENCE, >1 + if (ce && ce->ce_flags & ZEND_ACC_IMMUTABLE) { + | LOAD_ADDR FCARG2a, prop_info + } else { + int prop_info_offset = + (((prop_info->offset - (sizeof(zend_object) - sizeof(zval))) / sizeof(zval)) * sizeof(void*)); + + | mov r0, aword [FCARG1a + offsetof(zend_object, ce)] + | mov r0, aword [r0 + offsetof(zend_class_entry, properties_info_table)] + | mov FCARG2a, aword[r0 + prop_info_offset] + } if (Z_REG(prop_addr) != ZREG_FCARG1a || Z_OFFSET(prop_addr) != 0) { | LOAD_ZVAL_ADDR FCARG1a, prop_addr } - | LOAD_ADDR FCARG2a, prop_info |.if X64 | LOAD_ZVAL_ADDR CARG3, res_addr |.else @@ -13466,8 +13475,32 @@ static int zend_jit_assign_obj_op(dasm_State **Dst, if (ZEND_TYPE_IS_SET(prop_info->type)) { uint32_t info = val_info; + if (opline) { + | SET_EX_OPLINE opline, r0 + } + + | IF_ZVAL_TYPE prop_addr, IS_REFERENCE, >1 + |.cold_code + |1: + | GET_ZVAL_PTR FCARG1a, prop_addr + if (Z_MODE(val_addr) != IS_MEM_ZVAL || Z_REG(val_addr) != ZREG_FCARG2a || Z_OFFSET(val_addr) != 0) { + | LOAD_ZVAL_ADDR FCARG2a, val_addr + } + |.if X64 + | LOAD_ADDR CARG3, binary_op + |.else + | sub r4, 12 + | PUSH_ADDR binary_op, r0 + |.endif + | EXT_CALL zend_jit_assign_op_to_typed_ref, r0 + |.if not(X64) + | add r4, 12 + |.endif + | jmp >9 + |.code + | // value = zend_assign_to_typed_prop(prop_info, property_val, value EXECUTE_DATA_CC); - | SET_EX_OPLINE opline, r0 + if (ce && ce->ce_flags & ZEND_ACC_IMMUTABLE) { | LOAD_ADDR FCARG2a, prop_info } else { |