polish perm free list management

diff --git a/src/codegen.rs b/src/codegen.rs
index 873454944fa3fdc2ec3acd4e1f163ee663092429..33ac87d93f7b9a0a9cd0d52ad5d8c4c770e8e82a 100644 (file)
--- a/src/codegen.rs
+++ b/src/codegen.rs
@@ -904,7 +904,7 @@ impl<'b> CodeGenerator<'b> {
 
                                     code.push_back(instr!("proceed"));
                                 } else {
-                                    self.marker.free_cut_var(chunk_num, var_num);
+                                    self.marker.free_var(chunk_num, var_num);
                                 }
                             }
                             &QueryTerm::Clause(

diff --git a/src/debray_allocator.rs b/src/debray_allocator.rs
index 6bfbfb5ed07f8b1accb652ab7b073b9629d9ceb9..c1f32c49ccc63759832d39e338ac80dd667549c5 100644 (file)
--- a/src/debray_allocator.rs
+++ b/src/debray_allocator.rs
@@ -151,8 +151,11 @@ impl DebrayAllocator {
         };
 
         for var_num in subsumed_hits.iter().cloned() {
+            let running_count = self.var_data.records[var_num].running_count;
+            let num_occurrences = self.var_data.records[var_num].num_occurrences;
+
             match &mut self.var_data.records[var_num].allocation {
-                VarAlloc::Perm(_, ref mut allocation) => {
+                VarAlloc::Perm(_, allocation) => {
                     let shallow_safety = VarSafetyStatus::needed_if(
                         shallow_safety.contains(var_num),
                         branch_designator,
@@ -163,7 +166,9 @@ impl DebrayAllocator {
                         branch_designator,
                     );
 
-                    *allocation = PermVarAllocation::Done { shallow_safety, deep_safety };
+                    if running_count < num_occurrences {
+                        *allocation = PermVarAllocation::Done { shallow_safety, deep_safety };
+                    }
                 }
                 _ => unreachable!()
             }
@@ -435,7 +440,7 @@ impl DebrayAllocator {
         None
     }
 
-    pub(crate) fn free_cut_var(&mut self, chunk_num: usize, var_num: usize) {
+    pub(crate) fn free_var(&mut self, chunk_num: usize, var_num: usize) {
         match &mut self.var_data.records[var_num].allocation {
             VarAlloc::Perm(_, allocation) => {
                 *allocation = PermVarAllocation::Pending;
@@ -724,8 +729,8 @@ impl Allocator for DebrayAllocator {
 
         if record.running_count < record.num_occurrences {
             record.running_count += 1;
-        } else if r.is_perm() {
-            self.add_perm_to_free_list(term_loc.chunk_num(), var_num);
+        } else {
+            self.free_var(term_loc.chunk_num(), var_num);
         }
 
         self.in_use.insert(o);