Changeset 824 for trunk/processor/hashtable.m4

Timestamp:

03/22/2012 06:53:11 PM (14 months ago)

Author:

moo

Message:

PHP_5_4: empty hashtable was optimized

Files:

• trunk/processor/hashtable.m4 (modified) (2 diffs)

trunk/processor/hashtable.m4

@@ -88 +88 @@
         IFCOPY(`dst->pInternalPointer = NULL;   /* Used for element traversal */') DONE(pInternalPointer)
         IFCOPY(`dst->pListHead = NULL;') DONE(pListHead)
+#ifdef ZEND_ENGINE_2_4
+        if (src->nTableMask) {
+#endif
         CALLOC(dst->arBuckets, Bucket*, src->nTableSize)
         DONE(arBuckets)
         DISABLECHECK(`
-
         for (b = src->pListHead; b != NULL; b = b->pListNext) {
             ifelse($4, `', `', `
@@ -155 +157 @@
         }
         ')
+#ifdef ZEND_ENGINE_2_4
+    }
+    else { /* if (src->nTableMask) */
+        DONE(arBuckets)
+    }
+#endif
         IFCOPY(`dst->pListTail = pnew;') DONE(pListTail)
         IFCOPY(`dst->pDestructor = src->pDestructor;') DONE(pDestructor)