Removed dead code

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 0505eab3ddfe4484adfa4eaa9b9da45e67c5aa05..1a100cb59a2671c90824633fcbf0dae10ad34e8c 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3228,7 +3228,7 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET, CONST|TMP|VAR|CV, ANY)
                }
        }
 
-       if (ce && ce->get_iterator) {
+       if (OP1_TYPE != IS_TMP_VAR && ce && ce->get_iterator) {
                iter = ce->get_iterator(ce, array_ptr, opline->extended_value & ZEND_FE_RESET_REFERENCE TSRMLS_CC);
 
                if (iter && !EG(exception)) {

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 68b5b11531a6b4bdd60b7605228503f6908bed0d..24618c57c0ca2401d98af4755eeb9ee1d60cbd66 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2171,7 +2171,7 @@ static int ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                }
        }
 
-       if (ce && ce->get_iterator) {
+       if (IS_CONST != IS_TMP_VAR && ce && ce->get_iterator) {
                iter = ce->get_iterator(ce, array_ptr, opline->extended_value & ZEND_FE_RESET_REFERENCE TSRMLS_CC);
 
                if (iter && !EG(exception)) {
@@ -4786,7 +4786,7 @@ static int ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                }
        }
 
-       if (ce && ce->get_iterator) {
+       if (IS_TMP_VAR != IS_TMP_VAR && ce && ce->get_iterator) {
                iter = ce->get_iterator(ce, array_ptr, opline->extended_value & ZEND_FE_RESET_REFERENCE TSRMLS_CC);
 
                if (iter && !EG(exception)) {
@@ -8006,7 +8006,7 @@ static int ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                }
        }
 
-       if (ce && ce->get_iterator) {
+       if (IS_VAR != IS_TMP_VAR && ce && ce->get_iterator) {
                iter = ce->get_iterator(ce, array_ptr, opline->extended_value & ZEND_FE_RESET_REFERENCE TSRMLS_CC);
 
                if (iter && !EG(exception)) {
@@ -20575,7 +20575,7 @@ static int ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                }
        }
 
-       if (ce && ce->get_iterator) {
+       if (IS_CV != IS_TMP_VAR && ce && ce->get_iterator) {
                iter = ce->get_iterator(ce, array_ptr, opline->extended_value & ZEND_FE_RESET_REFERENCE TSRMLS_CC);
 
                if (iter && !EG(exception)) {