mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-18 22:41:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reduce slow code size

Browse Source
This commit is contained in:
Dmitry Stogov 2019-01-16 14:26:32 +03:00
parent 44f4370880
commit 8661b6dd5d
3 changed files with 438 additions and 759 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zend/zend_execute.c
View File

@ -627,6 +627,7 @@ static zend_never_inline ZEND_COLD int zend_wrong_assign_to_variable_reference(z
}
/* Use IS_TMP_VAR instead of IS_VAR to avoid ISREF check */
Z_TRY_ADDREF_P(value_ptr);
value_ptr = zend_assign_to_variable(variable_ptr, value_ptr, IS_TMP_VAR, EX_USES_STRICT_TYPES());
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {

89
Zend/zend_vm_def.h
View File

@ -2521,10 +2521,7 @@ ZEND_VM_HANDLER(39, ZEND_ASSIGN_REF, VAR|CV, VAR|CV, SRC)
UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT)) {
zend_throw_error(NULL, "Cannot assign by reference to an array dimension of an object");
FREE_OP1_VAR_PTR();
FREE_OP2_VAR_PTR();
UNDEF_RESULT();
HANDLE_EXCEPTION();
variable_ptr = &EG(uninitialized_zval);
} else if (OP2_TYPE == IS_VAR && UNEXPECTED(Z_ISERROR_P(value_ptr))) {
variable_ptr = &EG(uninitialized_zval);
} else if (OP2_TYPE == IS_VAR &&
@ -2532,14 +2529,8 @@ ZEND_VM_HANDLER(39, ZEND_ASSIGN_REF, VAR|CV, VAR|CV, SRC)
UNEXPECTED(!Z_ISREF_P(value_ptr))) {
if (UNEXPECTED(!zend_wrong_assign_to_variable_reference(variable_ptr, value_ptr OPLINE_CC EXECUTE_DATA_CC))) {
FREE_OP2_VAR_PTR();
UNDEF_RESULT();
HANDLE_EXCEPTION();
variable_ptr = &EG(uninitialized_zval);
}
/* op2 freed by assign_to_variable */
FREE_OP1_VAR_PTR();
ZEND_VM_NEXT_OPCODE();
} else {
zend_assign_to_variable_reference(variable_ptr, value_ptr);
}
@ -2586,11 +2577,7 @@ ZEND_VM_HANDLER(200, ZEND_ASSIGN_OBJ_REF, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV, C
variable_ptr = &EG(uninitialized_zval);
} else if (UNEXPECTED(Z_TYPE(variable) != IS_INDIRECT)) {
zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
FREE_OP1_VAR_PTR();
FREE_OP2();
FREE_OP_DATA_VAR_PTR();
UNDEF_RESULT();
HANDLE_EXCEPTION();
variable_ptr = &EG(uninitialized_zval);
} else if (OP_DATA_TYPE == IS_VAR && UNEXPECTED(Z_ISERROR_P(value_ptr))) {
variable_ptr = &EG(uninitialized_zval);
} else if (OP_DATA_TYPE == IS_VAR &&
@ -2599,17 +2586,8 @@ ZEND_VM_HANDLER(200, ZEND_ASSIGN_OBJ_REF, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV, C
if (UNEXPECTED(!zend_wrong_assign_to_variable_reference(
Z_INDIRECT_P(variable_ptr), value_ptr OPLINE_CC EXECUTE_DATA_CC))) {
FREE_OP1_VAR_PTR();
FREE_OP2();
FREE_OP_DATA_VAR_PTR();
UNDEF_RESULT();
HANDLE_EXCEPTION();
variable_ptr = &EG(uninitialized_zval);
}
/* op_data freed by assign_to_variable */
FREE_OP1_VAR_PTR();
FREE_OP2();
ZEND_VM_NEXT_OPCODE_EX(1, 2);
} else {
zend_property_info *prop_info = NULL;
@ -2619,22 +2597,22 @@ ZEND_VM_HANDLER(200, ZEND_ASSIGN_OBJ_REF, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV, C
prop_info = zend_object_fetch_property_type_info(Z_OBJ_P(container), variable_ptr);
}
if (UNEXPECTED(prop_info)) {
if (!zend_verify_prop_assignable_by_ref(prop_info, value_ptr, EX_USES_STRICT_TYPES())) {
FREE_OP1_VAR_PTR();
FREE_OP2();
FREE_OP_DATA_VAR_PTR();
HANDLE_EXCEPTION();
}
do {
if (UNEXPECTED(prop_info)) {
if (!zend_verify_prop_assignable_by_ref(prop_info, value_ptr, EX_USES_STRICT_TYPES())) {
variable_ptr = &EG(uninitialized_zval);
break;
}
if (UNEXPECTED(Z_REFCOUNTED_P(variable_ptr)) && Z_ISREF_P(variable_ptr)) {
ZEND_REF_DEL_TYPE_SOURCE(Z_REF_P(variable_ptr), prop_info);
if (UNEXPECTED(Z_REFCOUNTED_P(variable_ptr)) && Z_ISREF_P(variable_ptr)) {
ZEND_REF_DEL_TYPE_SOURCE(Z_REF_P(variable_ptr), prop_info);
}
}
}
zend_assign_to_variable_reference(variable_ptr, value_ptr);
if (prop_info) {
ZEND_REF_ADD_TYPE_SOURCE(Z_REF_P(variable_ptr), prop_info);
}
zend_assign_to_variable_reference(variable_ptr, value_ptr);
if (prop_info) {
ZEND_REF_ADD_TYPE_SOURCE(Z_REF_P(variable_ptr), prop_info);
}
} while (0);
}
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
@ -2668,27 +2646,24 @@ ZEND_VM_HANDLER(202, ZEND_ASSIGN_STATIC_PROP_REF, CONST|TMPVAR|CV, UNUSED|CONST|
prop = &EG(uninitialized_zval);
} else if (OP_DATA_TYPE == IS_VAR && (opline->extended_value & ZEND_RETURNS_FUNCTION) && UNEXPECTED(!Z_ISREF_P(value_ptr))) {
if (UNEXPECTED(!zend_wrong_assign_to_variable_reference(prop, value_ptr OPLINE_CC EXECUTE_DATA_CC))) {
FREE_OP_DATA_VAR_PTR();
UNDEF_RESULT();
HANDLE_EXCEPTION();
prop = &EG(uninitialized_zval);
}
/* op_data freed by assign_to_variable */
ZEND_VM_NEXT_OPCODE_EX(1, 2);
} else {
if (UNEXPECTED(prop_info->type)) {
if (!zend_verify_prop_assignable_by_ref(prop_info, value_ptr, EX_USES_STRICT_TYPES())) {
FREE_OP_DATA_VAR_PTR();
HANDLE_EXCEPTION();
do {
if (UNEXPECTED(prop_info->type)) {
if (!zend_verify_prop_assignable_by_ref(prop_info, value_ptr, EX_USES_STRICT_TYPES())) {
prop = &EG(uninitialized_zval);
break;
}
if (UNEXPECTED(Z_REFCOUNTED_P(prop)) && Z_ISREF_P(prop)) {
ZEND_REF_DEL_TYPE_SOURCE(Z_REF_P(prop), prop_info);
}
}
if (UNEXPECTED(Z_REFCOUNTED_P(prop)) && Z_ISREF_P(prop)) {
ZEND_REF_DEL_TYPE_SOURCE(Z_REF_P(prop), prop_info);
zend_assign_to_variable_reference(prop, value_ptr);
if (prop_info->type) {
ZEND_REF_ADD_TYPE_SOURCE(Z_REF_P(prop), prop_info);
}
}
}
zend_assign_to_variable_reference(prop, value_ptr);
if (prop_info->type) {
ZEND_REF_ADD_TYPE_SOURCE(Z_REF_P(prop), prop_info);
} while (0);
}
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {

1107
Zend/zend_vm_execute.h
View File

File diff suppressed because it is too large Load Diff