dmitry Tue, 22 Jun 2010 14:15:08 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300657
Log:
Removed redundant code
Changed paths:
U php/php-src/trunk/Zend/zend_execute.c
U php/php-src/trunk/Zend/zend_vm_def.h
U php/php-src/trunk/Zend/zend_vm_execute.h
Modified: php/php-src/trunk/Zend/zend_execute.c
===================================================================
--- php/php-src/trunk/Zend/zend_execute.c 2010-06-22 14:04:17 UTC (rev
300656)
+++ php/php-src/trunk/Zend/zend_execute.c 2010-06-22 14:15:08 UTC (rev
300657)
@@ -872,12 +872,8 @@
}
} else {
if (EXPECTED(variable_ptr != value)) {
- zend_uint refcount = Z_REFCOUNT_P(variable_ptr);
-
ZVAL_COPY_VALUE(&garbage, variable_ptr);
ZVAL_COPY_VALUE(variable_ptr, value);
- Z_SET_REFCOUNT_P(variable_ptr, refcount);
- Z_SET_ISREF_P(variable_ptr);
zendi_zval_dtor(garbage);
}
return variable_ptr;
@@ -934,12 +930,8 @@
}
} else {
if (EXPECTED(variable_ptr != value)) {
- zend_uint refcount = Z_REFCOUNT_P(variable_ptr);
-
ZVAL_COPY_VALUE(&garbage, variable_ptr);
ZVAL_COPY_VALUE(variable_ptr, value);
- Z_SET_REFCOUNT_P(variable_ptr, refcount);
- Z_SET_ISREF_P(variable_ptr);
zendi_zval_copy_ctor(*variable_ptr);
zendi_zval_dtor(garbage);
}
Modified: php/php-src/trunk/Zend/zend_vm_def.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_def.h 2010-06-22 14:04:17 UTC (rev
300656)
+++ php/php-src/trunk/Zend/zend_vm_def.h 2010-06-22 14:15:08 UTC (rev
300657)
@@ -2956,7 +2956,7 @@
}
}
-ZEND_VM_HANDLER(65, ZEND_SEND_VAL, CONST|TMP|VAR|CV, ANY)
+ZEND_VM_HANDLER(65, ZEND_SEND_VAL, CONST|TMP, ANY)
{
USE_OPLINE
Modified: php/php-src/trunk/Zend/zend_vm_execute.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_execute.h 2010-06-22 14:04:17 UTC (rev
300656)
+++ php/php-src/trunk/Zend/zend_vm_execute.h 2010-06-22 14:15:08 UTC (rev
300657)
@@ -10416,34 +10416,6 @@
HANDLE_EXCEPTION();
}
-static int ZEND_FASTCALL
ZEND_SEND_VAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
- USE_OPLINE
-
- SAVE_OPLINE();
- if (opline->extended_value==ZEND_DO_FCALL_BY_NAME
- && ARG_MUST_BE_SENT_BY_REF(EX(fbc), opline->op2.opline_num)) {
- zend_error_noreturn(E_ERROR, "Cannot pass parameter %d
by reference", opline->op2.opline_num);
- }
- {
- zval *valptr;
- zval *value;
- zend_free_op free_op1;
-
- value = _get_zval_ptr_var(opline->op1.var, EX_Ts(), &free_op1
TSRMLS_CC);
-
- ALLOC_ZVAL(valptr);
- INIT_PZVAL_COPY(valptr, value);
- if (!0) {
- zval_copy_ctor(valptr);
- }
- zend_vm_stack_push(valptr TSRMLS_CC);
- if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
- }
- CHECK_EXCEPTION();
- ZEND_VM_NEXT_OPCODE();
-}
-
static int ZEND_FASTCALL
zend_send_by_var_helper_SPEC_VAR(ZEND_OPCODE_HANDLER_ARGS)
{
USE_OPLINE
@@ -26400,34 +26372,6 @@
HANDLE_EXCEPTION();
}
-static int ZEND_FASTCALL
ZEND_SEND_VAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
- USE_OPLINE
-
- SAVE_OPLINE();
- if (opline->extended_value==ZEND_DO_FCALL_BY_NAME
- && ARG_MUST_BE_SENT_BY_REF(EX(fbc), opline->op2.opline_num)) {
- zend_error_noreturn(E_ERROR, "Cannot pass parameter %d
by reference", opline->op2.opline_num);
- }
- {
- zval *valptr;
- zval *value;
-
-
- value = _get_zval_ptr_cv_BP_VAR_R(EX_CVs(), opline->op1.var
TSRMLS_CC);
-
- ALLOC_ZVAL(valptr);
- INIT_PZVAL_COPY(valptr, value);
- if (!0) {
- zval_copy_ctor(valptr);
- }
- zend_vm_stack_push(valptr TSRMLS_CC);
-
- }
- CHECK_EXCEPTION();
- ZEND_VM_NEXT_OPCODE();
-}
-
static int ZEND_FASTCALL
zend_send_by_var_helper_SPEC_CV(ZEND_OPCODE_HANDLER_ARGS)
{
USE_OPLINE
@@ -37512,21 +37456,11 @@
ZEND_SEND_VAL_SPEC_TMP_HANDLER,
ZEND_SEND_VAL_SPEC_TMP_HANDLER,
ZEND_SEND_VAL_SPEC_TMP_HANDLER,
- ZEND_SEND_VAL_SPEC_VAR_HANDLER,
- ZEND_SEND_VAL_SPEC_VAR_HANDLER,
- ZEND_SEND_VAL_SPEC_VAR_HANDLER,
- ZEND_SEND_VAL_SPEC_VAR_HANDLER,
- ZEND_SEND_VAL_SPEC_VAR_HANDLER,
ZEND_NULL_HANDLER,
ZEND_NULL_HANDLER,
ZEND_NULL_HANDLER,
ZEND_NULL_HANDLER,
ZEND_NULL_HANDLER,
- ZEND_SEND_VAL_SPEC_CV_HANDLER,
- ZEND_SEND_VAL_SPEC_CV_HANDLER,
- ZEND_SEND_VAL_SPEC_CV_HANDLER,
- ZEND_SEND_VAL_SPEC_CV_HANDLER,
- ZEND_SEND_VAL_SPEC_CV_HANDLER,
ZEND_NULL_HANDLER,
ZEND_NULL_HANDLER,
ZEND_NULL_HANDLER,
@@ -37537,6 +37471,16 @@
ZEND_NULL_HANDLER,
ZEND_NULL_HANDLER,
ZEND_NULL_HANDLER,
+ ZEND_NULL_HANDLER,
+ ZEND_NULL_HANDLER,
+ ZEND_NULL_HANDLER,
+ ZEND_NULL_HANDLER,
+ ZEND_NULL_HANDLER,
+ ZEND_NULL_HANDLER,
+ ZEND_NULL_HANDLER,
+ ZEND_NULL_HANDLER,
+ ZEND_NULL_HANDLER,
+ ZEND_NULL_HANDLER,
ZEND_SEND_VAR_SPEC_VAR_HANDLER,
ZEND_SEND_VAR_SPEC_VAR_HANDLER,
ZEND_SEND_VAR_SPEC_VAR_HANDLER,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
