handle TCO when setting up verify_attributes interrupts

2019-10-13 14:13:52 -06:00
parent 249b613e36
commit da89b1af63
3 changed files with 8 additions and 3 deletions
--- a/src/prolog/machine/attributed_variables.rs
+++ b/src/prolog/machine/attributed_variables.rs
@@ -40,7 +40,12 @@ impl AttrVarInitializer {
 impl MachineState {
    pub(super) fn push_attr_var_binding(&mut self, h: usize, addr: Addr) {
        if self.attr_var_init.bindings.is_empty() {
-            self.attr_var_init.cp = self.p.local();
+            if self.last_call {
+                self.attr_var_init.cp = self.cp;
+            } else {
+                self.attr_var_init.cp = self.p.local();
+            }
+            
            self.p = CodePtr::VerifyAttrInterrupt(self.attr_var_init.verify_attrs_loc);
        }