Changes in libcfa/src/heap.cfa [03b87140:a3ade94]

File:

• libcfa/src/heap.cfa (modified) (3 diffs)

libcfa/src/heap.cfa

@@ -1233 +1233 @@
         // Attempt to reuse existing storage.
         HeapManager.Storage.Header * header = headerAddr( oaddr );
-        bool isFakeHeader = header->kind.fake.alignment & 1 == 1;       // old fake header ?
-        if ( unlikely ( ( isFakeHeader &&
+        if ( unlikely ( ( header->kind.fake.alignment & 1 == 1 &&       // old fake header ?
                                  (uintptr_t)oaddr % nalign == 0 &&                              // lucky match ?
                                  header->kind.fake.alignment <= nalign &&               // ok to leave LSB at 1
                                  nalign <= 128 )                                                                // not too much alignment storage wasted ?
-                        ||   ( (!isFakeHeader) &&                                                       // old real header ( aligned on libAlign ) ?
+                        ||   ( header->kind.fake.alignment & 1 != 1 &&          // old real header ( aligned on libAlign ) ?
                                  nalign == libAlign() ) ) ) {                                   // new alignment also on libAlign
 
@@ -1247 +1246 @@
 
                 if ( size <= odsize && odsize <= size * 2 ) { // allow 50% wasted data storage
-                        if ( isFakeHeader ) {
-                                headerAddr( oaddr )->kind.fake.alignment = nalign | 1; // update alignment (could be the same)
-                        }
+                        headerAddr( oaddr )->kind.fake.alignment = nalign | 1; // update alignment (could be the same)
 
                         header->kind.real.blockSize &= -2;              // turn off 0 fill
@@ -1290 +1287 @@
 
         // Attempt to reuse existing storage.
-        bool isFakeHeader = header->kind.fake.alignment & 1 == 1;       // old fake header ?
-        if ( unlikely ( ( isFakeHeader &&
+        if ( unlikely ( ( header->kind.fake.alignment & 1 == 1 &&       // old fake header ?
                                  (uintptr_t)oaddr % nalign == 0 &&                              // lucky match ?
                                  header->kind.fake.alignment <= nalign &&               // ok to leave LSB at 1
                                  nalign <= 128 )                                                                // not too much alignment storage wasted ?
-                        ||   ( (!isFakeHeader) &&                                                       // old real header ( aligned on libAlign ) ?
+                        ||   ( header->kind.fake.alignment & 1 != 1 &&          // old real header ( aligned on libAlign ) ?
                                  nalign == libAlign() ) ) ) {                                   // new alignment also on libAlign
 
-                if ( isFakeHeader ) {
-                        headerAddr( oaddr )->kind.fake.alignment = nalign | 1; // update alignment (could be the same)
-                }
+                headerAddr( oaddr )->kind.fake.alignment = nalign | 1; // update alignment (could be the same)
                 return realloc( oaddr, size );