Optimized FE_RESET and FE_FETCH

Author: dstogov

Zend/zend_hash.c

@@ -1489,58 +1489,6 @@ ZEND_API zend_bool zend_hash_index_exists(const HashTable *ht, zend_ulong h)
 }
 
 
-ZEND_API zend_bool zend_hash_get_pointer(const HashTable *ht, HashPointer *ptr)
-{
-	ptr->pos = ht->nInternalPointer;
-	ptr->ht = (HashTable*)ht;
-	if (ht->nInternalPointer != INVALID_IDX) {
-		ptr->h = ht->arData[ht->nInternalPointer].h;
-		return 1;
-	} else {
-		ptr->h = 0;
-		return 0;
-	}
-}
-
-ZEND_API zend_bool zend_hash_set_pointer(HashTable *ht, const HashPointer *ptr)
-{
-	uint32_t idx;
-
-	if (ptr->pos == INVALID_IDX) {
-		ht->nInternalPointer = INVALID_IDX;
-	} else if (ptr->ht != ht) {
-		IS_CONSISTENT(ht);
-		for (idx = 0; idx < ht->nNumUsed; idx++) {
-			if (Z_TYPE(ht->arData[idx].val) != IS_UNDEF) {
-				ht->nInternalPointer = idx;
-				return 0;
-			}
-		}
-		idx = INVALID_IDX;
-		return 0;
-	} else if (ht->nInternalPointer != ptr->pos) {
-		IS_CONSISTENT(ht);
-		if (ht->u.flags & HASH_FLAG_PACKED) {
-			if (ptr->h < ht->nNumUsed &&
-			    Z_TYPE(ht->arData[ptr->h].val) != IS_UNDEF) {
-				ht->nInternalPointer = ptr->h;
-				return 1;
-			}
-		} else {
-			idx = ht->arHash[ptr->h & ht->nTableMask];
-			while (idx != INVALID_IDX) {
-				if (ht->arData[idx].h == ptr->h && idx == ptr->pos) {
-					ht->nInternalPointer = idx;
-					return 1;
-				}
-				idx = Z_NEXT(ht->arData[idx].val);
-			}
-		}
-		return 0;
-	}
-	return 1;
-}
-
 ZEND_API void zend_hash_internal_pointer_reset_ex(HashTable *ht, HashPosition *pos)
 {
     uint32_t idx;

Zend/zend_hash.h

@@ -177,9 +177,6 @@ typedef struct _HashPointer {
 	zend_ulong h;
 } HashPointer;
 
-ZEND_API zend_bool zend_hash_get_pointer(const HashTable *ht, HashPointer *ptr);
-ZEND_API zend_bool zend_hash_set_pointer(HashTable *ht, const HashPointer *ptr);
-
 #define zend_hash_has_more_elements(ht) \
 	zend_hash_has_more_elements_ex(ht, &(ht)->nInternalPointer)
 #define zend_hash_move_forward(ht) \

Zend/zend_iterators.c

@@ -84,29 +84,13 @@ ZEND_API void zend_iterator_dtor(zend_object_iterator *iter TSRMLS_DC)
 	zend_objects_store_del(&iter->std TSRMLS_CC);
 }
 
-ZEND_API enum zend_object_iterator_kind zend_iterator_unwrap(
-	zval *array_ptr, zend_object_iterator **iter TSRMLS_DC)
+ZEND_API zend_object_iterator* zend_iterator_unwrap(zval *array_ptr TSRMLS_DC)
 {
-	switch (Z_TYPE_P(array_ptr)) {
-		case IS_OBJECT:
-			if (Z_OBJ_HT_P(array_ptr) == &iterator_object_handlers) {
-				*iter = (zend_object_iterator *)Z_OBJ_P(array_ptr);
-				return ZEND_ITER_OBJECT;
-			}
-			if (Z_OBJPROP_P(array_ptr)) {
-				return ZEND_ITER_PLAIN_OBJECT;
-			}
-			return ZEND_ITER_INVALID;
-
-		case IS_ARRAY:
-			if (Z_ARRVAL_P(array_ptr)) {
-				return ZEND_ITER_PLAIN_ARRAY;
-			}
-			return ZEND_ITER_INVALID;
-
-		default:
-			return ZEND_ITER_INVALID;
+	if (Z_TYPE_P(array_ptr) &&
+	    Z_OBJ_HT_P(array_ptr) == &iterator_object_handlers) {
+		return (zend_object_iterator *)Z_OBJ_P(array_ptr);
 	}
+	return NULL;
 }
 
 /*

Zend/zend_iterators.h

@@ -71,16 +71,9 @@ typedef struct _zend_class_iterator_funcs {
 	union _zend_function *zf_rewind;
 } zend_class_iterator_funcs;
 
-enum zend_object_iterator_kind {
-	ZEND_ITER_INVALID,
-	ZEND_ITER_PLAIN_ARRAY,
-	ZEND_ITER_PLAIN_OBJECT,
-	ZEND_ITER_OBJECT
-};
-
 BEGIN_EXTERN_C()
 /* given a zval, returns stuff that can be used to iterate it. */
-ZEND_API enum zend_object_iterator_kind zend_iterator_unwrap(zval *array_ptr, zend_object_iterator **iter TSRMLS_DC);
+ZEND_API zend_object_iterator* zend_iterator_unwrap(zval *array_ptr TSRMLS_DC);
 
 /* given an iterator, wrap it up as a zval for use by the engine opcodes */
 ZEND_API void zend_iterator_init(zend_object_iterator *iter TSRMLS_DC);