diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-13 10:53:40 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-13 10:53:40 +0800 |
| commit | 2766dbaf6dd20d0f5498b69815b4579933063a19 (patch) | |
| tree | 9f9d8f665fdc66283086dd61207c264e67e571a0 | |
| parent | 12abac8bb78c494597d740e7f9afd202f63180a3 (diff) | |
| download | php-git-2766dbaf6dd20d0f5498b69815b4579933063a19.tar.gz | |
Unused vars
| -rw-r--r-- | Zend/zend_hash.c | 1 | ||||
| -rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 4 |
3 files changed, 1 insertions, 6 deletions
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index e93e2e6752..25349c766e 100644 --- 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 858a3f777e..1aabbfa762 100644 --- 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 6d24cac6d4..40873ef693 100644 --- 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); |