Changeset 2b23d78

Timestamp:

Jul 21, 2020, 11:16:09 AM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d8d8f20

Parents:

b0a0ee4

Message:

check for allocation size change and reset if necessary in resize and realloc

File:

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

libcfa/src/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jul 19 17:37:21 2020
-// Update Count     : 806
+// Last Modified On : Mon Jul 20 23:00:32 2020
+// Update Count     : 808
 //
 
@@ -901 +901 @@
           if ( oalign == 0 && size <= odsize && odsize <= size * 2 ) { // allow 50% wasted storage for smaller size
                         header->kind.real.blockSize &= -2;                      // no alignment and turn off 0 fill
+                        if ( size != odsize ) header->kind.real.size = size; // reset allocation size
                         return oaddr;
                 } // if
@@ -929 +930 @@
 
                 size_t odsize = dataStorage( bsize, oaddr, header ); // data storage available in bucket
-          if ( size <= odsize && odsize <= size * 2 ) { // allow up to 50% wasted storage in smaller size
-                        // Do not know size of original allocation => cannot do 0 fill for any additional space because do not know
-                        // where to start filling, i.e., do not overwrite existing values in space.
+          if ( size <= odsize && odsize <= size * 2 ) {         // allow up to 50% wasted storage in smaller size
+                        if ( size != odsize ) header->kind.real.size = size; // reset allocation size
                         return oaddr;
                 } // if
@@ -1227 +1227 @@
                 if ( size <= odsize && odsize <= size * 2 ) {   // allow 50% wasted storage for smaller size
                         header->kind.real.blockSize &= -2;                      // turn off 0 fill
+                        if ( size != odsize ) header->kind.real.size = size; // reset allocation size
                         return oaddr;
                 } // if