From c1336009c282c5f7e013ae49ff40c3fd0d6546cc Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 19 Jul 2010 14:34:34 +0000 Subject: [PATCH] Removed invalid checks --- Zend/zend_vm_def.h | 8 ++------ Zend/zend_vm_execute.h | 16 ++++------------ 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index afa1532bfa..36307be875 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -901,9 +901,7 @@ ZEND_VM_HANDLER(36, ZEND_POST_INC, VAR|CV, ANY) zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets"); } if (OP1_TYPE == IS_VAR && UNEXPECTED(*var_ptr == &EG(error_zval))) { - if (RETURN_VALUE_USED(opline)) { - ZVAL_NULL(&EX_T(opline->result.var).tmp_var); - } + ZVAL_NULL(&EX_T(opline->result.var).tmp_var); FREE_OP1_VAR_PTR(); CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); @@ -946,9 +944,7 @@ ZEND_VM_HANDLER(37, ZEND_POST_DEC, VAR|CV, ANY) zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets"); } if (OP1_TYPE == IS_VAR && UNEXPECTED(*var_ptr == &EG(error_zval))) { - if (RETURN_VALUE_USED(opline)) { - ZVAL_NULL(&EX_T(opline->result.var).tmp_var); - } + ZVAL_NULL(&EX_T(opline->result.var).tmp_var); FREE_OP1_VAR_PTR(); CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 43ac7dbd1a..997ebd9aaa 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -9870,9 +9870,7 @@ static int ZEND_FASTCALL ZEND_POST_INC_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets"); } if (IS_VAR == IS_VAR && UNEXPECTED(*var_ptr == &EG(error_zval))) { - if (RETURN_VALUE_USED(opline)) { - ZVAL_NULL(&EX_T(opline->result.var).tmp_var); - } + ZVAL_NULL(&EX_T(opline->result.var).tmp_var); if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}; CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); @@ -9915,9 +9913,7 @@ static int ZEND_FASTCALL ZEND_POST_DEC_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets"); } if (IS_VAR == IS_VAR && UNEXPECTED(*var_ptr == &EG(error_zval))) { - if (RETURN_VALUE_USED(opline)) { - ZVAL_NULL(&EX_T(opline->result.var).tmp_var); - } + ZVAL_NULL(&EX_T(opline->result.var).tmp_var); if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}; CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); @@ -25552,9 +25548,7 @@ static int ZEND_FASTCALL ZEND_POST_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets"); } if (IS_CV == IS_VAR && UNEXPECTED(*var_ptr == &EG(error_zval))) { - if (RETURN_VALUE_USED(opline)) { - ZVAL_NULL(&EX_T(opline->result.var).tmp_var); - } + ZVAL_NULL(&EX_T(opline->result.var).tmp_var); CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); @@ -25596,9 +25590,7 @@ static int ZEND_FASTCALL ZEND_POST_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets"); } if (IS_CV == IS_VAR && UNEXPECTED(*var_ptr == &EG(error_zval))) { - if (RETURN_VALUE_USED(opline)) { - ZVAL_NULL(&EX_T(opline->result.var).tmp_var); - } + ZVAL_NULL(&EX_T(opline->result.var).tmp_var); CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); -- 2.40.0