rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eliminate call_with_inference_limit/3 leaks (#1300)

Browse Source
This commit is contained in:
Mark
2023-07-15 10:22:23 -06:00
parent b6a81c51ab
commit e95355e56e
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/machine/system_calls.rs
View File

@@ -5263,14 +5263,18 @@ impl Machine {
}; };
let bp = cell_as_fixnum!(a1).get_num() as usize; let bp = cell_as_fixnum!(a1).get_num() as usize;
let a3 = self.deref_register(3);
let count = self.machine_st.cwil.add_limit(n, bp); let count = self.machine_st.cwil.add_limit(n, bp);
let count = arena_alloc!(count.clone(), &mut self.machine_st.arena);
if let Some(count) = count.to_i64() {
self.machine_st.unify_fixnum(Fixnum::build_with(count), a3);
} else {
let count = arena_alloc!(count.clone(), &mut self.machine_st.arena);
self.machine_st.unify_big_int(count, a3);
}
self.machine_st.increment_call_count_fn = MachineState::increment_call_count; self.machine_st.increment_call_count_fn = MachineState::increment_call_count;
let a3 = self.deref_register(3);
self.machine_st.unify_big_int(count, a3);
Ok(()) Ok(())
} }
@@ -5410,14 +5414,18 @@ impl Machine {
#[inline(always)] #[inline(always)]
pub(crate) fn remove_inference_counter(&mut self) { pub(crate) fn remove_inference_counter(&mut self) {
let a1 = self.deref_register(1); let a1 = self.deref_register(1);
let a2 = self.deref_register(2);
let bp = cell_as_fixnum!(a1).get_num() as usize; let bp = cell_as_fixnum!(a1).get_num() as usize;
let count = self.machine_st.cwil.remove_limit(bp).clone(); let count = self.machine_st.cwil.remove_limit(bp).clone();
let count = arena_alloc!(count.clone(), &mut self.machine_st.arena);
let a2 = self.deref_register(2); if let Some(count) = count.to_i64() {
self.machine_st.unify_fixnum(Fixnum::build_with(count), a2);
self.machine_st.unify_big_int(count, a2); } else {
let count = arena_alloc!(count.clone(), &mut self.machine_st.arena);
self.machine_st.unify_big_int(count, a2);
}
} }
#[inline(always)] #[inline(always)]