Merge remote-tracking branch 'origin/develop'

Author: rv-auditor

include/runtime/arena.h

@@ -111,6 +111,20 @@ class arena {
   // allocated within an arena.
   static char get_arena_semispace_id_of_object(void *ptr);
 
+  // Unmaps the current and collection address spaces and resets them and the tripwire.
+  // This is needed when the client switches thread contexts without properly deallocating
+  // them. This is not a common use case and shoul be used carefully.
+  void munmap_arena_and_reset() {
+    if (current_addr_ptr)
+      munmap(current_addr_ptr, HYPERBLOCK_SIZE);
+    if (collection_addr_ptr)
+      munmap(collection_addr_ptr, HYPERBLOCK_SIZE);
+
+    current_addr_ptr = nullptr;
+    collection_addr_ptr = nullptr;
+    tripwire = nullptr;
+  }
+
 private:
   void initialize_semispace();
   //

runtime/collect/collect.cpp

@@ -12,6 +12,7 @@
 extern "C" {
 extern thread_local arena youngspace;
 extern thread_local arena oldspace;
+extern thread_local arena alwaysgcspace;
 
 char *youngspace_ptr(void);
 char *oldspace_ptr(void);
@@ -345,5 +346,8 @@ void kore_collect(
 void free_all_kore_mem() {
   kore_collect(nullptr, 0, nullptr, true);
   kore_clear();
+  youngspace.munmap_arena_and_reset();
+  oldspace.munmap_arena_and_reset();
+  alwaysgcspace.munmap_arena_and_reset();
 }
 }