dmitry Mon, 19 Jul 2010 14:34:34 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=301402
Log:
Removed invalid checks
Changed paths:
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_vm_def.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_def.h 2010-07-19 14:19:52 UTC (rev
301401)
+++ php/php-src/trunk/Zend/zend_vm_def.h 2010-07-19 14:34:34 UTC (rev
301402)
@@ -901,9 +901,7 @@
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_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();
Modified: php/php-src/trunk/Zend/zend_vm_execute.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_execute.h 2010-07-19 14:19:52 UTC (rev
301401)
+++ php/php-src/trunk/Zend/zend_vm_execute.h 2010-07-19 14:34:34 UTC (rev
301402)
@@ -9870,9 +9870,7 @@
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 @@
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 @@
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 @@
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();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
