archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Optimize fast path

Browse source
This commit is contained in:
Dmitry Stogov 2015-08-24 12:47:06 +03:00
parent b928ea2de7
commit db5898c9e5
2 changed files with 36 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Zend/zend_vm_def.h
View file

@ -7628,20 +7628,30 @@ ZEND_VM_C_LABEL(check_indirect):
} }
} }
variable_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_W);
do { do {
zend_reference *ref; zend_reference *ref;
if (UNEXPECTED(!Z_ISREF_P(value))) { if (UNEXPECTED(!Z_ISREF_P(value))) {
ZVAL_NEW_REF(value, value); ref = (zend_reference*)emalloc(sizeof(zend_reference));
} else if (UNEXPECTED(variable_ptr == value)) { GC_REFCOUNT(ref) = 2;
break; GC_TYPE_INFO(ref) = IS_REFERENCE;
ZVAL_COPY_VALUE(&ref->val, value);
Z_REF_P(value) = ref;
Z_TYPE_INFO_P(value) = IS_REFERENCE_EX;
} else {
ref = Z_REF_P(value);
GC_REFCOUNT(ref)++;
} }
ref = Z_REF_P(value);
GC_REFCOUNT(ref)++; variable_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_W);
if (UNEXPECTED(Z_REFCOUNTED_P(variable_ptr))) { if (UNEXPECTED(Z_REFCOUNTED_P(variable_ptr))) {
if (!Z_DELREF_P(variable_ptr)) { uint32_t refcnt = Z_DELREF_P(variable_ptr);
if (UNEXPECTED(variable_ptr == value)) {
break;
}
if (refcnt == 0) {
SAVE_OPLINE(); SAVE_OPLINE();
zval_dtor_func_for_ptr(Z_COUNTED_P(variable_ptr)); zval_dtor_func_for_ptr(Z_COUNTED_P(variable_ptr));
if (UNEXPECTED(EG(exception))) { if (UNEXPECTED(EG(exception))) {

26
Zend/zend_vm_execute.h
View file

@ -32798,20 +32798,30 @@ check_indirect:
} }
} }
variable_ptr = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
do { do {
zend_reference *ref; zend_reference *ref;
if (UNEXPECTED(!Z_ISREF_P(value))) { if (UNEXPECTED(!Z_ISREF_P(value))) {
ZVAL_NEW_REF(value, value); ref = (zend_reference*)emalloc(sizeof(zend_reference));
} else if (UNEXPECTED(variable_ptr == value)) { GC_REFCOUNT(ref) = 2;
break; GC_TYPE_INFO(ref) = IS_REFERENCE;
ZVAL_COPY_VALUE(&ref->val, value);
Z_REF_P(value) = ref;
Z_TYPE_INFO_P(value) = IS_REFERENCE_EX;
} else {
ref = Z_REF_P(value);
GC_REFCOUNT(ref)++;
} }
ref = Z_REF_P(value);
GC_REFCOUNT(ref)++; variable_ptr = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
if (UNEXPECTED(Z_REFCOUNTED_P(variable_ptr))) { if (UNEXPECTED(Z_REFCOUNTED_P(variable_ptr))) {
if (!Z_DELREF_P(variable_ptr)) { uint32_t refcnt = Z_DELREF_P(variable_ptr);
if (UNEXPECTED(variable_ptr == value)) {
break;
}
if (refcnt == 0) {
SAVE_OPLINE(); SAVE_OPLINE();
zval_dtor_func_for_ptr(Z_COUNTED_P(variable_ptr)); zval_dtor_func_for_ptr(Z_COUNTED_P(variable_ptr));
if (UNEXPECTED(EG(exception))) { if (UNEXPECTED(EG(exception))) {