feat: try to use boa gc

CertainLach · Jan 16, 2024 · 7fd85a5 · 7fd85a5
1 parent eeb6fd0
commit 7fd85a5
Show file tree

Hide file tree

Showing 39 changed files with 498 additions and 457 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/jsonnet/src/import.rs b/bindings/jsonnet/src/import.rs
@@ -17,7 +17,7 @@ use jrsonnet_evaluator::{
 	error::{ErrorKind::*, Result},
 	FileImportResolver, ImportResolver,
 };
-use jrsonnet_gcmodule::Trace;
+use boa_gc::Trace;
 use jrsonnet_parser::{SourceDirectory, SourceFile, SourcePath};
 
 use crate::VM;

diff --git a/crates/jrsonnet-evaluator/Cargo.toml b/crates/jrsonnet-evaluator/Cargo.toml
@@ -35,7 +35,6 @@ jrsonnet-interner.workspace = true
 jrsonnet-parser.workspace = true
 jrsonnet-types.workspace = true
 jrsonnet-macros.workspace = true
-jrsonnet-gcmodule.workspace = true
 
 pathdiff.workspace = true
 hashbrown.workspace = true
@@ -57,3 +56,4 @@ annotate-snippets = { workspace = true, features = ["color"], optional = true }
 # Bigint
 num-bigint = { workspace = true, features = ["serde"], optional = true }
 derivative.workspace = true
+boa_gc = { git = "https://github.com/boa-dev/boa", version = "0.17.0" }
diff --git a/crates/jrsonnet-evaluator/src/arr/mod.rs b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -1,20 +1,20 @@
 use std::any::Any;
 
-use jrsonnet_gcmodule::{Cc, Trace};
+use boa_gc::{Gc, Trace, Finalize, GcBox};
 use jrsonnet_interner::IBytes;
 use jrsonnet_parser::LocExpr;
 
-use crate::{function::FuncVal, gc::TraceBox, tb, Context, Result, Thunk, Val};
+use crate::{DynGcBox, dyn_gc_box};
+use crate::{function::FuncVal, Context, Result, Thunk, Val};
 
 mod spec;
 pub use spec::ArrayLike;
 pub(crate) use spec::*;
 
 /// Represents a Jsonnet array value.
-#[derive(Debug, Clone, Trace)]
+#[derive(Debug, Clone, Trace, Finalize)]
 // may contrain other ArrValue
-#[trace(tracking(force))]
-pub struct ArrValue(Cc<TraceBox<dyn ArrayLike>>);
+pub struct ArrValue(DynGcBox<dyn ArrayLike>);
 
 pub trait ArrayLikeIter<T>: Iterator<Item = T> + DoubleEndedIterator + ExactSizeIterator {}
 impl<I, T> ArrayLikeIter<T> for I where
@@ -24,7 +24,7 @@ impl<I, T> ArrayLikeIter<T> for I where
 
 impl ArrValue {
 	pub fn new(v: impl ArrayLike) -> Self {
-		Self(Cc::new(tb!(v)))
+		Self(dyn_gc_box!(v))
 	}
 	pub fn empty() -> Self {
 		Self::new(RangeArray::empty())
@@ -177,7 +177,7 @@ impl ArrValue {
 	}
 
 	pub fn ptr_eq(a: &Self, b: &Self) -> bool {
-		Cc::ptr_eq(&a.0, &b.0)
+		Gc::ptr_eq(&a.0, &b.0)
 	}
 
 	/// Is this vec supports `.get_cheap()?`