Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 30 additions & 9 deletions gc/src/gc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ thread_local!(static GC_STATE: RefCell<GcState> = RefCell::new(GcState {
}));

const MARK_MASK: usize = 1 << (usize::BITS - 1);
const ROOTS_MASK: usize = !MARK_MASK;
const FINALIZED_MASK: usize = 1 << (usize::BITS - 2);
const ROOTS_MASK: usize = !(MARK_MASK | FINALIZED_MASK);
const ROOTS_MAX: usize = ROOTS_MASK; // max allowed value of roots

pub(crate) struct GcBoxHeader {
Expand Down Expand Up @@ -81,22 +82,32 @@ impl GcBoxHeader {
// abort if the count overflows to prevent `mem::forget` loops
// that could otherwise lead to erroneous drops
if (roots & ROOTS_MASK) < ROOTS_MAX {
self.roots.set(roots + 1); // we checked that this wont affect the high bit
self.roots.set(roots + 1); // we checked that this wont affect the high bits
} else {
panic!("roots counter overflow");
}
}

#[inline]
pub fn dec_roots(&self) {
self.roots.set(self.roots.get() - 1); // no underflow check
self.roots.set(self.roots.get() - 1); // no underflow check, always nonzero number of roots
}

#[inline]
pub fn is_marked(&self) -> bool {
self.roots.get() & MARK_MASK != 0
}

#[inline]
pub fn is_finalized(&self) -> bool {
self.roots.get() & FINALIZED_MASK != 0
}

#[inline]
pub fn set_finalized(&self) {
self.roots.set(self.roots.get() | FINALIZED_MASK)
}

#[inline]
pub fn mark(&self) {
self.roots.set(self.roots.get() | MARK_MASK);
Expand Down Expand Up @@ -298,9 +309,13 @@ fn collect_garbage(st: &mut GcState) {
unsafe fn sweep(finalized: Vec<Unmarked<'_>>, bytes_allocated: &mut usize) {
let _guard = DropGuard::new();
for node in finalized.into_iter().rev() {
if node.this.as_ref().header.is_marked() {
continue;
}
// sanity check. If this trips we have violated an unsafe invarant.
// This won't catch all UB, just direct reclamation of roots!!
assert_eq!(
node.this.as_ref().header.roots(),
0,
"Reclaimed node should not be rooted"
);
let incoming = node.incoming;
let node = Box::from_raw(node.this.as_ptr());
*bytes_allocated -= mem::size_of_val::<GcBox<_>>(&*node);
Expand All @@ -316,10 +331,16 @@ fn collect_garbage(st: &mut GcState) {
if unmarked.is_empty() {
return;
}
for node in &unmarked {
Trace::finalize_glue(&node.this.as_ref().data);
// finalize unmarked nodes
for node in unmarked {
if !node.this.as_ref().header.is_finalized() {
Trace::finalize_glue(&node.this.as_ref().data);
node.this.as_ref().header.set_finalized();
}
}
mark(head);
// rerun mark phase and reclaim unmarked finalized nodes
let mut unmarked = mark(head);
unmarked.retain(|node| node.this.as_ref().header.is_finalized());
sweep(unmarked, &mut st.stats.bytes_allocated);
}
}
Expand Down
30 changes: 29 additions & 1 deletion gc/tests/finalize.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use gc::{Finalize, Trace};
use gc::{Finalize, Gc, GcCell, Trace};
use std::cell::Cell;

#[derive(PartialEq, Eq, Debug, Clone, Copy)]
Expand Down Expand Up @@ -46,3 +46,31 @@ fn drop_triggers_finalize() {
}
FLAGS.with(|f| assert_eq!(f.get(), Flags(1, 1)));
}

#[derive(Trace)]
struct Resurrection {
escape: Gc<GcCell<Gc<String>>>,
value: Gc<String>,
}

impl Finalize for Resurrection {
fn finalize(&self) {
*self.escape.borrow_mut() = self.value.clone();
}
}

// run this with miri to detect UB
// cargo +nightly miri test -p gc --test finalize
#[test]
fn finalizer_can_resurrect() {
let escape = Gc::new(GcCell::new(Gc::new(String::new())));
let value = Gc::new(GcCell::new(Resurrection {
escape: escape.clone(),
value: Gc::new(String::from("Hello world")),
}));
drop(value);

gc::force_collect();

assert_eq!(&**escape.borrow(), "Hello world");
}