Removed dead code

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index fcc52c0a4e4763bde3f95a673c2fe893949afc8f..a5e117daf06ac6596ff7017216abf7f60166ae09 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3137,7 +3137,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 ee53a7455ce6f6406b8f4d1e06494c8076920c18..c91c9f40832687c86634414da59c9f30696c3616 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2186,7 +2186,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)) {
@@ -4727,7 +4727,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)) {
@@ -7858,7 +7858,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)) {
@@ -19919,7 +19919,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)) {