From 04836f0e55f7155ce00abfb4a295fd981df9f81e Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 20 Feb 2015 13:46:32 +0300
Subject: [PATCH] Removed dead code

---
 ext/opcache/zend_accelerator_util_funcs.c | 73 ++++++++---------------
 1 file changed, 25 insertions(+), 48 deletions(-)

diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c
index d902604767..f3c6824667 100644
--- a/ext/opcache/zend_accelerator_util_funcs.c
+++ b/ext/opcache/zend_accelerator_util_funcs.c
@@ -711,21 +711,14 @@ static void zend_accel_function_hash_copy(HashTable *target, HashTable *source)
 	for (idx = 0; idx < source->nNumUsed; idx++) {
 		p = source->arData + idx;
 		if (Z_TYPE(p->val) == IS_UNDEF) continue;
-		if (p->key) {
-			t = zend_hash_add(target, p->key, &p->val);
-			if (UNEXPECTED(t == NULL)) {
-				if (p->key->len > 0 && p->key->val[0] == 0) {
-					/* Mangled key */
-					t = zend_hash_update(target, p->key, &p->val);
-				} else {
-					t = zend_hash_find(target, p->key);
-					goto failure;
-				}
-			}
-		} else {
-		    t = zend_hash_index_add(target, p->h, &p->val);
-			if (UNEXPECTED(t == NULL)) {
-				t = zend_hash_index_find(target, p->h);
+		ZEND_ASSERT(p->key);
+		t = zend_hash_add(target, p->key, &p->val);
+		if (UNEXPECTED(t == NULL)) {
+			if (p->key->len > 0 && p->key->val[0] == 0) {
+				/* Mangled key */
+				t = zend_hash_update(target, p->key, &p->val);
+			} else {
+				t = zend_hash_find(target, p->key);
 				goto failure;
 			}
 		}
@@ -760,21 +753,14 @@ static void zend_accel_function_hash_copy_from_shm(HashTable *target, HashTable
 	for (idx = 0; idx < source->nNumUsed; idx++) {
 		p = source->arData + idx;
 		if (Z_TYPE(p->val) == IS_UNDEF) continue;
-		if (p->key) {
-			t = zend_hash_add(target, p->key, &p->val);
-			if (UNEXPECTED(t == NULL)) {
-				if (p->key->len > 0 && p->key->val[0] == 0) {
-					/* Mangled key */
-					t = zend_hash_update(target, p->key, &p->val);
-				} else {
-					t = zend_hash_find(target, p->key);
-					goto failure;
-				}
-			}
-		} else {
-		    t = zend_hash_index_add(target, p->h, &p->val);
-			if (UNEXPECTED(t == NULL)) {
-				t = zend_hash_index_find(target, p->h);
+		ZEND_ASSERT(p->key);
+		t = zend_hash_add(target, p->key, &p->val);
+		if (UNEXPECTED(t == NULL)) {
+			if (p->key->len > 0 && p->key->val[0] == 0) {
+				/* Mangled key */
+				t = zend_hash_update(target, p->key, &p->val);
+			} else {
+				t = zend_hash_find(target, p->key);
 				goto failure;
 			}
 		}
@@ -811,24 +797,15 @@ static void zend_accel_class_hash_copy(HashTable *target, HashTable *source, uni
 	for (idx = 0; idx < source->nNumUsed; idx++) {
 		p = source->arData + idx;
 		if (Z_TYPE(p->val) == IS_UNDEF) continue;
-		if (p->key) {
-			t = zend_hash_add(target, p->key, &p->val);
-			if (UNEXPECTED(t == NULL)) {
-				if (p->key->len > 0 && p->key->val[0] == 0) {
-					/* Mangled key - ignore and wait for runtime */
-					continue;
-				} else if (!ZCG(accel_directives).ignore_dups) {
-					t = zend_hash_find(target, p->key);
-					goto failure;
-				}
-			}
-		} else {
-			t = zend_hash_index_add(target, p->h, &p->val);
-			if (UNEXPECTED(t == NULL)) {
-				if (!ZCG(accel_directives).ignore_dups) {
-					t = zend_hash_index_find(target,p->h);
-					goto failure;
-				}
+		ZEND_ASSERT(p->key);
+		t = zend_hash_add(target, p->key, &p->val);
+		if (UNEXPECTED(t == NULL)) {
+			if (p->key->len > 0 && p->key->val[0] == 0) {
+				/* Mangled key - ignore and wait for runtime */
+				continue;
+			} else if (!ZCG(accel_directives).ignore_dups) {
+				t = zend_hash_find(target, p->key);
+				goto failure;
 			}
 		}
 		if (pCopyConstructor) {
-- 
2.40.0