From: Dmitry Stogov Date: Mon, 26 Jul 2010 12:40:32 +0000 (+0000) Subject: Removed deprecated check X-Git-Tag: php-5.4.0alpha1~191^2~1169 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d30073a2dcfcf8b40fe7dd14ea02163007012aa4;p=php Removed deprecated check --- diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 44184c2174..7d9b98fed6 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1588,7 +1588,7 @@ ZEND_VM_HANDLER(98, ZEND_FETCH_DIM_TMP_VAR, CONST|TMP, CONST) zend_free_op free_op2; zval *value = *zend_fetch_dimension_address_inner(Z_ARRVAL_P(container), GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_R TSRMLS_CC); - SELECTIVE_PZVAL_LOCK(value, opline); + PZVAL_LOCK(value); AI_SET_PTR(&EX_T(opline->result.var), value); FREE_OP2(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 70be2d52fe..d774af24ea 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2832,7 +2832,7 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_TMP_VAR_SPEC_CONST_CONST_HANDLER(ZEND_O zval *value = *zend_fetch_dimension_address_inner(Z_ARRVAL_P(container), opline->op2.zv, IS_CONST, BP_VAR_R TSRMLS_CC); - SELECTIVE_PZVAL_LOCK(value, opline); + PZVAL_LOCK(value); AI_SET_PTR(&EX_T(opline->result.var), value); } @@ -7134,7 +7134,7 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_TMP_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPC zval *value = *zend_fetch_dimension_address_inner(Z_ARRVAL_P(container), opline->op2.zv, IS_CONST, BP_VAR_R TSRMLS_CC); - SELECTIVE_PZVAL_LOCK(value, opline); + PZVAL_LOCK(value); AI_SET_PTR(&EX_T(opline->result.var), value); }