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

Removed useless reference counting

Browse source
This commit is contained in:
Dmitry Stogov 2016-06-08 11:24:53 +03:00
parent 3610156c5d
commit fc587c7c55
2 changed files with 73 additions and 723 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Zend/zend_vm_def.h
View file

@ -2242,7 +2242,6 @@ ZEND_VM_C_LABEL(fast_assign_obj):
if (EXPECTED(zobj->properties == NULL)) { if (EXPECTED(zobj->properties == NULL)) {
rebuild_object_properties(zobj); rebuild_object_properties(zobj);
} }
/* separate our value if necessary */
if (OP_DATA_TYPE == IS_CONST) { if (OP_DATA_TYPE == IS_CONST) {
if (UNEXPECTED(Z_OPT_REFCOUNTED_P(value))) { if (UNEXPECTED(Z_OPT_REFCOUNTED_P(value))) {
Z_ADDREF_P(value); Z_ADDREF_P(value);
@ -2289,12 +2288,7 @@ ZEND_VM_C_LABEL(fast_assign_obj):
ZEND_VM_C_GOTO(exit_assign_obj); ZEND_VM_C_GOTO(exit_assign_obj);
} }
/* separate our value if necessary */ if (OP_DATA_TYPE == IS_TMP_VAR || OP_DATA_TYPE == IS_VAR) {
if (OP_DATA_TYPE == IS_CONST) {
if (UNEXPECTED(Z_OPT_REFCOUNTED_P(value))) {
Z_ADDREF_P(value);
}
} else if (OP_DATA_TYPE != IS_TMP_VAR) {
ZVAL_DEREF(value); ZVAL_DEREF(value);
} }
@ -2303,11 +2297,7 @@ ZEND_VM_C_LABEL(fast_assign_obj):
if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
ZVAL_COPY(EX_VAR(opline->result.var), value); ZVAL_COPY(EX_VAR(opline->result.var), value);
} }
if (OP_DATA_TYPE == IS_CONST) { FREE_OP_DATA();
zval_ptr_dtor_nogc(value);
} else {
FREE_OP_DATA();
}
ZEND_VM_C_LABEL(exit_assign_obj): ZEND_VM_C_LABEL(exit_assign_obj):
FREE_OP2(); FREE_OP2();
FREE_OP1_VAR_PTR(); FREE_OP1_VAR_PTR();
@ -2364,21 +2354,13 @@ ZEND_VM_C_LABEL(try_assign_dim_array):
dim = GET_OP2_ZVAL_PTR(BP_VAR_R); dim = GET_OP2_ZVAL_PTR(BP_VAR_R);
value = GET_OP_DATA_ZVAL_PTR(BP_VAR_R); value = GET_OP_DATA_ZVAL_PTR(BP_VAR_R);
if (OP_DATA_TYPE == IS_CONST && UNEXPECTED(Z_REFCOUNTED_P(value))) {
Z_ADDREF_P(value);
}
zend_assign_to_object_dim(object_ptr, dim, value); zend_assign_to_object_dim(object_ptr, dim, value);
if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
ZVAL_COPY(EX_VAR(opline->result.var), value); ZVAL_COPY(EX_VAR(opline->result.var), value);
} }
if (OP_DATA_TYPE == IS_CONST) { FREE_OP_DATA();
zval_ptr_dtor_nogc(value);
} else {
FREE_OP_DATA();
}
} else if (EXPECTED(Z_TYPE_P(object_ptr) == IS_STRING)) { } else if (EXPECTED(Z_TYPE_P(object_ptr) == IS_STRING)) {
if (OP2_TYPE == IS_UNUSED) { if (OP2_TYPE == IS_UNUSED) {
zend_throw_error(NULL, "[] operator not supported for strings"); zend_throw_error(NULL, "[] operator not supported for strings");

772
Zend/zend_vm_execute.h
View file

File diff suppressed because it is too large Load diff