Merge branch 'status' into eamsden/flog

rust/ares/src/interpreter.rs

@@ -1185,13 +1185,19 @@ fn exit(
     unsafe {
         context.restore(snapshot);
 
+        if context.stack.copying() {
+            assert!(context.stack.get_frame_pointer() != virtual_frame);
+            context.stack.frame_pop();
+        }
+
         let stack = &mut context.stack;
         let mut preserve = match error {
             Error::ScryBlocked(path) => path,
             Error::Deterministic(_, t) | Error::NonDeterministic(_, t) | Error::ScryCrashed(t) => {
                 // Return $tang of traces
                 let h = *(stack.local_noun_pointer(0));
                 // XX: Small chance of clobbering something important after OOM?
+                // XX: what if we OOM while making a stack trace
                 T(stack, &[h, t])
             }
         };

rust/ares/src/mem.rs

@@ -137,6 +137,10 @@ impl NockStack {
         };
     }
 
+    pub fn copying(&self) -> bool {
+        self.pc
+    }
+
     /** Current frame pointer of this NockStack */
     pub fn get_frame_pointer(&self) -> *const u64 {
         self.frame_pointer

rust/ares_pma/c-src/btree.c

@@ -1134,6 +1134,7 @@ _pending_flist_merge(BT_state *state)
     src_head = src_head->next;
     free(prev);
   }
+  state->pending_flist = 0;
 }