Unused vars

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index e93e2e6752662fdbdd5309de731fbd0260c6f4fd..25349c766e4444a3fb367777c4d9082704517eac 100644 (file)
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -313,7 +313,6 @@ ZEND_API HashPosition zend_hash_iterators_lower_pos(HashTable *ht, HashPosition
        HashTableIterator *iter = EG(ht_iterators);
        HashTableIterator *end  = iter + EG(ht_iterators_used);
        HashPosition res = INVALID_IDX;
-       uint32_t idx;
 
        while (iter != end) {
                if (iter->ht == ht) {

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 858a3f777e1f25c3cc46a00f7b890e9babc33370..1aabbfa762d2f0effa367b775dee61cb8ce04015 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4972,7 +4972,6 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH_R, VAR, ANY)
 
                if ((iter = zend_iterator_unwrap(array)) == NULL) {
                        /* plain object */
-                       zend_object *zobj = Z_OBJ_P(array);
 
                        fe_ht = Z_OBJPROP_P(array);
                        pos = zend_hash_iterator_pos(Z_FE_ITER_P(EX_VAR(opline->op1.var)), fe_ht);
@@ -5150,7 +5149,6 @@ ZEND_VM_HANDLER(126, ZEND_FE_FETCH_RW, VAR, ANY)
 
                if ((iter = zend_iterator_unwrap(array)) == NULL) {
                        /* plain object */
-                       zend_object *zobj = Z_OBJ_P(array);
 
                        fe_ht = Z_OBJPROP_P(array);
                        pos = zend_hash_iterator_pos(Z_FE_ITER_P(EX_VAR(opline->op1.var)), fe_ht);

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 6d24cac6d440de7c6e07deb65a57fb4c836ced66..40873ef693d729047f1d85b250734cab480a287d 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2724,7 +2724,7 @@ static int ZEND_FASTCALL  ZEND_NEW_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        } else {
                ce = Z_CE_P(EX_VAR(opline->op1.var));
        }
-       if (UNEXPECTED((ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) != 0)) {
+       if (UNEXPECTED((ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_TRAIT|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) != 0)) {
                if (ce->ce_flags & ZEND_ACC_INTERFACE) {
                        zend_error_noreturn(E_ERROR, "Cannot instantiate interface %s", ce->name->val);
                } else if (ce->ce_flags & ZEND_ACC_TRAIT) {
@@ -12275,7 +12275,6 @@ static int ZEND_FASTCALL  ZEND_FE_FETCH_R_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_A
 
                if ((iter = zend_iterator_unwrap(array)) == NULL) {
                        /* plain object */
-                       zend_object *zobj = Z_OBJ_P(array);
 
                        fe_ht = Z_OBJPROP_P(array);
                        pos = zend_hash_iterator_pos(Z_FE_ITER_P(EX_VAR(opline->op1.var)), fe_ht);
@@ -12453,7 +12452,6 @@ static int ZEND_FASTCALL  ZEND_FE_FETCH_RW_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_
 
                if ((iter = zend_iterator_unwrap(array)) == NULL) {
                        /* plain object */
-                       zend_object *zobj = Z_OBJ_P(array);
 
                        fe_ht = Z_OBJPROP_P(array);
                        pos = zend_hash_iterator_pos(Z_FE_ITER_P(EX_VAR(opline->op1.var)), fe_ht);