Ticket #7093: lists.patch

tools/build/v2/engine/lists.c

@@ -13 +13 @@
 
 #include <assert.h>
 
+static LIST * freelist[ 32 ];  /* junkpile for list_dealloc() */
 
-struct freelist_node { struct freelist_node * next; };
-
-static struct freelist_node * freelist[ 32 ];  /* junkpile for list_dealloc() */
-
 static unsigned get_bucket( unsigned size )
 {
     unsigned bucket = 0;
@@ -30 +27 @@
     unsigned const bucket = get_bucket( size );
     if ( freelist[ bucket ] )
     {
-        struct freelist_node * result = freelist[ bucket ];
-        freelist[ bucket ] = result->next;
-        return (LIST *)result;
+        LIST * result = freelist[ bucket ];
+        freelist[ bucket ] = result->impl.next;
+        return result;
     }
     return (LIST *)BJAM_MALLOC( sizeof( LIST ) + ( 1u << bucket ) *
         sizeof( OBJECT * ) );
@@ -42 +39 @@
 {
     unsigned size = list_length( l );
     unsigned bucket;
-    struct freelist_node * node = (struct freelist_node *)l;
+    LIST * node = l;
 
     if ( size == 0 ) return;
 
@@ -51 +48 @@
 #ifdef BJAM_NO_MEM_CACHE
     BJAM_FREE( node );
 #else
-    node->next = freelist[ bucket ];
+    node->impl.next = freelist[ bucket ];
     freelist[ bucket ] = node;
 #endif
 }
@@ -372 +369 @@
     int i;
     for ( i = 0; i < sizeof( freelist ) / sizeof( freelist[ 0 ] ); ++i )
     {
-        struct freelist_node * l = freelist[ i ];
+        LIST * l = freelist[ i ];
         while ( l )
         {
-            struct freelist_node * const tmp = l;
-            l = l->next;
+            LIST * const tmp = l;
+            l = l->impl.next;
             BJAM_FREE( tmp );
         }
     }

tools/build/v2/engine/lists.h

@@ -54 +54 @@
 typedef struct _list {
     union {
         int size;
+        struct _list * next;
         OBJECT * align;
     } impl;
 } LIST;