Ticket #7901: patch

tools/build/v2/engine/hash.c

@@ -34 +34 @@
 
 struct hashhdr
 {
-    struct item  * next;
+    union {
+        struct item  * next;
+        /*
+         * Some architectures have 32bit pointers but 64bit time_t (as used
+         * in file_info_t), and require natural alignement of data.
+         * Since we offset an aligned pointer by sizeof(hashhdr) in
+         * hash_item_data(item), we may cause misalignement if we do not
+         * make sure that sizeof(hashhdr) is properly aligned.
+         */
+        time_t aligner; /* unused dummy for alignement */
+    } h;
 };
 
 typedef struct item
@@ -106 +116 @@
     ITEM * i = *hash_bucket(hp,keyval);
     ITEM * p = 0;
 
-    for ( ; i; i = i->hdr.next )
+    for ( ; i; i = i->hdr.h.next )
     {
         if ( object_equal( hash_item_key( i ), keydata ) )
         {
@@ -153 +163 @@
         if ( hp->items.free )
         {
             i = hp->items.free;
-            hp->items.free = i->hdr.next;
+            hp->items.free = i->hdr.h.next;
             assert( hash_item_key( i ) == 0 );
         }
         else
@@ -162 +172 @@
             hp->items.next += hp->items.size;
         }
         hp->items.more--;
-        i->hdr.next = *base;
+        i->hdr.h.next = *base;
         *base = i;
         *found = 0;
     }
@@ -251 +261 @@
             /* code currently assumes rehashing only when there are no free items */
             assert( hash_item_key( i ) != 0 );
 
-            i->hdr.next = *ip;
+            i->hdr.h.next = *ip;
             *ip = i;
         }
     }
@@ -367 +377 @@
         {
             ITEM * item;
             int here = 0;
-            for ( item = tab[ i ]; item != 0; item = item->hdr.next )
+            for ( item = tab[ i ]; item != 0; item = item->hdr.h.next )
                 ++here;
 
             count += here;