Merge remote-tracking branch 'origin/develop'

Author: rv-auditor

include/kllvm/codegen/Util.h

@@ -42,6 +42,8 @@ llvm::Function *get_or_insert_function(llvm::Module *module, Ts &&...args) {
 
 char const *get_collection_alloc_fn(sort_category cat);
 
+void insert_call_to_clear(llvm::BasicBlock *bb);
+
 } // namespace kllvm
 
 #endif // KLLVM_UTIL_H

include/runtime/alloc.h

@@ -37,6 +37,8 @@ void *kore_alloc_always_gc(size_t requested);
 // if the swapOld flag is set, it also swaps the two semispaces of the old
 // generation
 void kore_alloc_swap(bool swap_old);
+// resets the alwaysgcspace, freeing all memory allocated by it
+void kore_clear(void);
 // resizes the last allocation into the young generation
 void *kore_resize_last_alloc(void *oldptr, size_t newrequest, size_t last_size);
 // allocator hook for the GMP library

lib/codegen/Decision.cpp

@@ -1156,6 +1156,7 @@ void make_step_function(
 
   init_choice_buffer(
       dt, module, block, pre_stuck, fail, &choice_buffer, &choice_depth, &jump);
+  insert_call_to_clear(block);
 
   llvm::AllocaInst *has_search_results = nullptr;
   if (search) {
@@ -1387,6 +1388,7 @@ void make_step_function(
   init_choice_buffer(
       res.dt, module, block, pre_stuck, fail, &choice_buffer, &choice_depth,
       &jump);
+  insert_call_to_clear(block);
 
   llvm::BranchInst::Create(stuck, pre_stuck);
   std::vector<llvm::PHINode *> phis;

lib/codegen/Util.cpp

@@ -68,4 +68,13 @@ char const *get_collection_alloc_fn(sort_category cat) {
   }
 }
 
+void insert_call_to_clear(llvm::BasicBlock *bb) {
+  llvm::Module *module = bb->getParent()->getParent();
+  auto *kore_clear = get_or_insert_function(
+      module, "kore_clear",
+      llvm::FunctionType::get(
+          llvm::Type::getVoidTy(module->getContext()), {}, false));
+  llvm::CallInst::Create(kore_clear, {}, "", bb);
+}
+
 } // namespace kllvm

runtime/alloc/alloc.cpp

@@ -58,12 +58,15 @@ bool youngspace_almost_full(size_t threshold) {
 
 void kore_alloc_swap(bool swap_old) {
   arena_swap_and_clear(&youngspace);
-  arena_clear(&alwaysgcspace);
   if (swap_old) {
     arena_swap_and_clear(&oldspace);
   }
 }
 
+void kore_clear() {
+  arena_clear(&alwaysgcspace);
+}
+
 void set_kore_memory_functions_for_gmp() {
   mp_set_memory_functions(kore_alloc_mp, kore_realloc_mp, kore_free);
 }

runtime/collect/collect.cpp

@@ -354,6 +354,7 @@ void kore_collect(void **roots, uint8_t nroots, layoutitem *type_info) {
 
 void free_all_kore_mem() {
   kore_collect(nullptr, 0, nullptr);
+  kore_clear();
 }
 
 bool is_collection() {