Merge branch 'status' into y/import-fix

This commit is contained in:
Edward Amsden 2023-09-13 21:31:07 -05:00 committed by GitHub
commit 6e0e5d103b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -351,6 +351,7 @@ impl NockStack {
unsafe fn copy(&mut self, noun: &mut Noun) {
self.pre_copy();
assert!(self.stack_is_empty());
let noun_ptr = noun as *mut Noun;
// Add two slots to the lightweight stack
// Set the first new slot to the noun to be copied
@ -447,6 +448,7 @@ impl NockStack {
&& (*(self.prev_stack_pointer_pointer())).is_null()
&& (*(self.prev_frame_pointer_pointer())).is_null()
);
assert!(self.stack_is_empty());
let noun_ptr = noun as *mut Noun;
*(self.push::<Noun>()) = *noun;
*(self.push::<*mut Noun>()) = noun_ptr;