i#2571 exit flags not reset: reset on init.

Tested: ctest,internal repro.

Fixes DynamoRIO#2571

core/heap.c

@@ -295,7 +295,7 @@ typedef struct _heap_t {
     uint num_dead;
 } heap_t;
 
-/* no synch needed since only written once */
+/* protected by dynamo_vm_areas_lock() */
 static bool heap_exiting = false;
 
 #ifdef DEBUG
@@ -1401,6 +1401,9 @@ vmm_heap_init()
     if (DYNAMO_OPTION(vm_reserve)) {
         vmm_heap_unit_init(&heapmgt->vmheap, DYNAMO_OPTION(vm_size));
     }
+    dynamo_vm_areas_lock();
+    heap_exiting = false;
+    dynamo_vm_areas_unlock();
 }
 
 void
@@ -1547,8 +1550,6 @@ heap_init()
      * FIXME: ensure that release build aligns ok?
      * I would be quite surprised if static vars were not 4-byte-aligned!
      */
-    ASSERT(ALIGN_BACKWARD(&heap_exiting, CACHE_LINE_SIZE()) ==
-           ALIGN_BACKWARD(&heap_exiting + 1, CACHE_LINE_SIZE()));
     ASSERT(ALIGN_BACKWARD(&heap_unit_lock.owner, CACHE_LINE_SIZE()) ==
            ALIGN_BACKWARD(&heap_unit_lock.owner + 1, CACHE_LINE_SIZE()));
 
@@ -1645,9 +1646,9 @@ heap_exit()
     heap_unit_t *u, *next_u;
     heap_management_t *temp;
 
-    heap_exiting = true;
     /* FIXME: we shouldn't need either lock if executed last */
     dynamo_vm_areas_lock();
+    heap_exiting = true;
     acquire_recursive_lock(&heap_unit_lock);
 
 #ifdef WINDOWS

core/vmareas.c

@@ -1566,6 +1566,7 @@ vm_areas_reset_init(void)
 void
 dynamo_vm_areas_init()
 {
+    vm_areas_exited = false;
     VMVECTOR_ALLOC_VECTOR(dynamo_areas, GLOBAL_DCONTEXT, VECTOR_SHARED,
                           dynamo_areas);
 }