Changeset 289a21c for libcfa/src/heap.cfa

Timestamp:

Jul 20, 2020, 10:40:25 AM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

03ed863

Parents:

e95a117 (diff), e93cbfa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/heap.cfa (modified) (3 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 : Sat Jun 13 22:42:15 2020
-// Update Count     : 805
+// Last Modified On : Sun Jul 19 17:37:21 2020
+// Update Count     : 806
 //
 
@@ -1098 +1098 @@
         // Returns original total allocation size (not bucket size) => array size is dimension * sizeif(T).
         size_t malloc_size( void * addr ) {
-          if ( unlikely( addr == 0p ) ) return false;           // null allocation is not zero fill
+          if ( unlikely( addr == 0p ) ) return 0;                       // null allocation has zero size
                 HeapManager.Storage.Header * header = headerAddr( addr );
                 if ( (header->kind.fake.alignment & 1) == 1 ) { // fake header ?
@@ -1108 +1108 @@
         // Set allocation size and return previous size.
         size_t $malloc_size_set( void * addr, size_t size ) {
-          if ( unlikely( addr == 0p ) ) return false;           // null allocation is not zero fill
+          if ( unlikely( addr == 0p ) ) return 0;                       // null allocation has 0 size
                 HeapManager.Storage.Header * header = headerAddr( addr );
                 if ( (header->kind.fake.alignment & 1) == 1 ) { // fake header ?