From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 26 Aug 2014 20:52:50 +0000 (+0400)
Subject: Split and optimize loop
X-Git-Tag: PRE_PHP7_REMOVALS~293
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=219794e1cd51e43af0a1155c294f735b9d9e9de4;p=php

Split and optimize loop
---

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 9dd5a4188d..5201e88bd4 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -886,28 +886,49 @@ ZEND_API int zend_hash_index_del(HashTable *ht, zend_ulong h)
 
 ZEND_API void zend_hash_destroy(HashTable *ht)
 {
-	uint idx;
-	Bucket *p;
+	Bucket *p, *end;
 
 	IS_CONSISTENT(ht);
 
-	SET_INCONSISTENT(HT_IS_DESTROYING);
-
-	for (idx = 0 ; idx < ht->nNumUsed; idx++) {
-		p = ht->arData + idx;
-		if (Z_TYPE(p->val) == IS_UNDEF) continue;
+	if (ht->nNumUsed) {
+		p = ht->arData;
+		end = p + ht->nNumUsed;
 		if (ht->pDestructor) {
-			ht->pDestructor(&p->val);
-		}
-		if (p->key) {
-			zend_string_release(p->key);
+			SET_INCONSISTENT(HT_IS_DESTROYING);
+
+			if (ht->u.flags & HASH_FLAG_PACKED) {
+				do {
+					if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF)) {
+						ht->pDestructor(&p->val);
+					}
+				} while (++p != end);
+			} else {
+				do {
+					if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF)) {
+						ht->pDestructor(&p->val);
+						if (EXPECTED(p->key)) {
+							zend_string_release(p->key);
+						}
+					}
+				} while (++p != end);
+			}
+		
+			SET_INCONSISTENT(HT_DESTROYED);
+		} else {
+			if (!(ht->u.flags & HASH_FLAG_PACKED)) {
+				do {
+					if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF)) {
+						if (EXPECTED(p->key)) {
+							zend_string_release(p->key);
+						}
+					}
+				} while (++p != end);
+			}
 		}
+	} else if (EXPECTED(!ht->nTableMask)) {
+		return;
 	}
-	if (ht->nTableMask) {
-		pefree(ht->arData, ht->u.flags & HASH_FLAG_PERSISTENT);
-	}
-
-	SET_INCONSISTENT(HT_DESTROYED);
+	pefree(ht->arData, ht->u.flags & HASH_FLAG_PERSISTENT);
 }