Changeset 72b0573 for libcfa/src

Timestamp:

Sep 18, 2018, 5:01:11 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

e523b07

Parents:

56b53b2 (diff), 91a950c (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 : Thu Aug 23 06:11:44 2018
-// Update Count     : 511
+// Last Modified On : Thu Sep  6 09:01:30 2018
+// Update Count     : 513
 //
 
@@ -329 +329 @@
         #endif // __CFA_DEBUG__
 
-        assert( heapManager.heapBegin == 0 );                           // always perform check, done once
-        heapManager{};
+        //assert( heapManager.heapBegin != 0 );
+        //heapManager{};
+        if ( heapManager.heapBegin == 0 ) heapManager{};
 } // memory_startup
 
@@ -700 +701 @@
 
 static inline void * mallocNoStats( size_t size ) {             // necessary for malloc statistics
-        assert( heapManager.heapBegin != 0 );
+        //assert( heapManager.heapBegin != 0 );
+        if ( unlikely( heapManager.heapBegin == 0 ) ) heapManager{}; // called before memory_startup ?
         void * area = doMalloc( size );
         if ( unlikely( area == 0 ) ) errno = ENOMEM;            // POSIX