archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Separated zend_binary_assign_op_typed_ref() and zend_binary_assign_op_typed_prop() helpers

Browse source
This commit is contained in:
Dmitry Stogov 2019-01-15 18:49:05 +03:00
parent 239305d12e
commit 938ba93f4a
3 changed files with 579 additions and 800 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Zend/zend_execute.c
View file

@ -1331,6 +1331,32 @@ static zend_never_inline void zend_binary_assign_op_obj_dim(zval *object, zval *
} }
} }
static zend_never_inline void zend_binary_assign_op_typed_ref(zend_reference *ref, zval *value, binary_op_type binary_op EXECUTE_DATA_DC)
{
zval z_copy;
binary_op(&z_copy, &ref->val, value);
if (EXPECTED(zend_verify_ref_assignable_zval(ref, &z_copy, EX_USES_STRICT_TYPES()))) {
zval_ptr_dtor(&ref->val);
ZVAL_COPY_VALUE(&ref->val, &z_copy);
} else {
zval_ptr_dtor(&z_copy);
}
}
static zend_never_inline void zend_binary_assign_op_typed_prop(zend_property_info *prop_info, zval *zptr, zval *value, binary_op_type binary_op EXECUTE_DATA_DC)
{
zval z_copy;
binary_op(&z_copy, zptr, value);
if (EXPECTED(zend_verify_property_type(prop_info, &z_copy, EX_USES_STRICT_TYPES()))) {
zval_ptr_dtor(zptr);
ZVAL_COPY_VALUE(zptr, &z_copy);
} else {
zval_ptr_dtor(&z_copy);
}
}
static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type EXECUTE_DATA_DC) static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type EXECUTE_DATA_DC)
{ {
zend_long offset; zend_long offset;

135
Zend/zend_vm_def.h
View file

@ -836,33 +836,29 @@ ZEND_VM_C_LABEL(assign_op_object):
} else { } else {
zval *orig_zptr = zptr; zval *orig_zptr = zptr;
zend_reference *ref; zend_reference *ref;
zend_bool is_typed_ref = 0;
if (UNEXPECTED(Z_ISREF_P(zptr))) { do {
ref = Z_REF_P(zptr); if (UNEXPECTED(Z_ISREF_P(zptr))) {
is_typed_ref = ZEND_REF_HAS_TYPE_SOURCES(ref); ref = Z_REF_P(zptr);
zptr = Z_REFVAL_P(zptr); if (UNEXPECTED(ZEND_REF_HAS_TYPE_SOURCES(ref))) {
} zend_binary_assign_op_typed_ref(ref, value, binary_op);
break;
if (OP2_TYPE == IS_CONST) { }
prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); zptr = Z_REFVAL_P(zptr);
} else {
prop_info = zend_object_fetch_property_type_info(Z_OBJ_P(object), orig_zptr);
}
if (UNEXPECTED(prop_info || is_typed_ref)) {
/* special case for typed properties */
zval z_copy;
binary_op(&z_copy, zptr, value);
if (EXPECTED(is_typed_ref ? zend_verify_ref_assignable_zval(ref, &z_copy, EX_USES_STRICT_TYPES()) : zend_verify_property_type(prop_info, &z_copy, EX_USES_STRICT_TYPES()))) {
zval_ptr_dtor(zptr);
ZVAL_COPY_VALUE(zptr, &z_copy);
} else {
zval_ptr_dtor(&z_copy);
} }
} else {
binary_op(zptr, zptr, value); if (OP2_TYPE == IS_CONST) {
} prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2);
} else {
prop_info = zend_object_fetch_property_type_info(Z_OBJ_P(object), orig_zptr);
}
if (UNEXPECTED(prop_info)) {
/* special case for typed properties */
zend_binary_assign_op_typed_prop(prop_info, zptr, value, binary_op);
} else {
binary_op(zptr, zptr, value);
}
} while (0);
if (UNEXPECTED(RETURN_VALUE_USED(opline))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
ZVAL_COPY(EX_VAR(opline->result.var), zptr); ZVAL_COPY(EX_VAR(opline->result.var), zptr);
@ -889,7 +885,6 @@ ZEND_VM_HELPER(zend_binary_assign_op_static_prop_helper, CONST|TMP|VAR|CV, UNUSE
zval *prop, *value; zval *prop, *value;
zend_property_info *prop_info; zend_property_info *prop_info;
zend_reference *ref; zend_reference *ref;
zend_bool is_typed_ref = 0;
SAVE_OPLINE(); SAVE_OPLINE();
@ -902,26 +897,23 @@ ZEND_VM_HELPER(zend_binary_assign_op_static_prop_helper, CONST|TMP|VAR|CV, UNUSE
value = GET_OP_DATA_ZVAL_PTR(BP_VAR_R); value = GET_OP_DATA_ZVAL_PTR(BP_VAR_R);
if (UNEXPECTED(Z_ISREF_P(prop))) { do {
ref = Z_REF_P(prop); if (UNEXPECTED(Z_ISREF_P(prop))) {
is_typed_ref = ZEND_REF_HAS_TYPE_SOURCES(ref); ref = Z_REF_P(prop);
prop = Z_REFVAL_P(prop); if (UNEXPECTED(ZEND_REF_HAS_TYPE_SOURCES(ref))) {
} zend_binary_assign_op_typed_ref(ref, value, binary_op);
break;
if (UNEXPECTED(prop_info->type || is_typed_ref)) { }
/* special case for typed properties */ prop = Z_REFVAL_P(prop);
zval z_copy;
binary_op(&z_copy, prop, value);
if (EXPECTED(is_typed_ref ? zend_verify_ref_assignable_zval(ref, &z_copy, EX_USES_STRICT_TYPES()) : zend_verify_property_type(prop_info, &z_copy, EX_USES_STRICT_TYPES()))) {
zval_ptr_dtor(prop);
ZVAL_COPY_VALUE(prop, &z_copy);
} else {
zval_ptr_dtor(&z_copy);
} }
} else {
binary_op(prop, prop, value); if (UNEXPECTED(prop_info->type)) {
} /* special case for typed properties */
zend_binary_assign_op_typed_prop(prop_info, prop, value, binary_op);
} else {
binary_op(prop, prop, value);
}
} while (0);
if (UNEXPECTED(RETURN_VALUE_USED(opline))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
ZVAL_COPY(EX_VAR(opline->result.var), prop); ZVAL_COPY(EX_VAR(opline->result.var), prop);
@ -966,28 +958,17 @@ ZEND_VM_C_LABEL(assign_dim_op_new_array):
value = get_op_data_zval_ptr_r((opline+1)->op1_type, (opline+1)->op1, &free_op_data1); value = get_op_data_zval_ptr_r((opline+1)->op1_type, (opline+1)->op1, &free_op_data1);
if (OP2_TYPE != IS_UNUSED && UNEXPECTED(Z_ISREF_P(var_ptr))) { do {
zend_reference *ref = Z_REF_P(var_ptr); if (OP2_TYPE != IS_UNUSED && UNEXPECTED(Z_ISREF_P(var_ptr))) {
var_ptr = Z_REFVAL_P(var_ptr); zend_reference *ref = Z_REF_P(var_ptr);
if (UNEXPECTED(ZEND_REF_HAS_TYPE_SOURCES(ref))) { var_ptr = Z_REFVAL_P(var_ptr);
zval tmp; if (UNEXPECTED(ZEND_REF_HAS_TYPE_SOURCES(ref))) {
binary_op(&tmp, var_ptr, value); zend_binary_assign_op_typed_ref(ref, value, binary_op);
if (EXPECTED(zend_verify_ref_assignable_zval(ref, &tmp, EX_USES_STRICT_TYPES()))) { break;
zval_ptr_dtor(var_ptr);
ZVAL_COPY_VALUE(var_ptr, &tmp);
} else {
zval_ptr_dtor(&tmp);
FREE_OP2();
FREE_OP(free_op_data1);
FREE_OP1_VAR_PTR();
HANDLE_EXCEPTION();
} }
} else {
binary_op(var_ptr, var_ptr, value);
} }
} else {
binary_op(var_ptr, var_ptr, value); binary_op(var_ptr, var_ptr, value);
} } while (0);
if (UNEXPECTED(RETURN_VALUE_USED(opline))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
ZVAL_COPY(EX_VAR(opline->result.var), var_ptr); ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
@ -1059,25 +1040,17 @@ ZEND_VM_HELPER(zend_binary_assign_op_simple_helper, VAR|CV, CONST|TMPVAR|CV, bin
ZVAL_NULL(EX_VAR(opline->result.var)); ZVAL_NULL(EX_VAR(opline->result.var));
} }
} else { } else {
zend_reference *ref = NULL; do {
if (UNEXPECTED(Z_TYPE_P(var_ptr) == IS_REFERENCE)) { if (UNEXPECTED(Z_TYPE_P(var_ptr) == IS_REFERENCE)) {
ref = Z_REF_P(var_ptr); zend_reference *ref = Z_REF_P(var_ptr);
var_ptr = Z_REFVAL_P(var_ptr); if (UNEXPECTED(ZEND_REF_HAS_TYPE_SOURCES(ref))) {
} zend_binary_assign_op_typed_ref(ref, value, binary_op);
break;
if (UNEXPECTED(ref && ZEND_REF_HAS_TYPE_SOURCES(ref))) { }
zval tmp; var_ptr = Z_REFVAL_P(var_ptr);
binary_op(&tmp, var_ptr, value);
if (UNEXPECTED(zend_verify_ref_assignable_zval(ref, &tmp, EX_USES_STRICT_TYPES()))) {
zval_ptr_dtor(var_ptr);
ZVAL_COPY_VALUE(var_ptr, &tmp);
} else {
zval_ptr_dtor(&tmp);
} }
} else {
binary_op(var_ptr, var_ptr, value); binary_op(var_ptr, var_ptr, value);
} } while (0);
if (UNEXPECTED(RETURN_VALUE_USED(opline))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
ZVAL_COPY(EX_VAR(opline->result.var), var_ptr); ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);

1218
Zend/zend_vm_execute.h
View file

File diff suppressed because it is too large Load diff