git.delta.rocks / jrsonnet / refs/commits / ab385dd4fde0

difftreelog

feat(jrsonnet-evaluator) implement gc

Yaroslav Bolyukin2021-06-05parent: #e2e1f7b.patch.diff
in: master
Some manual Trace/Finalize implementations can be replaced with derives
with https://github.com/Manishearth/rust-gc/pull/116 getting merged

17 files changed

modifiedcrates/jrsonnet-evaluator/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -30,13 +30,12 @@
 jrsonnet-types = { path = "../jrsonnet-types", version = "0.3.7" }
 pathdiff = "0.2.0"
 
-closure = "0.3.0"
-
 md5 = "0.7.0"
 base64 = "0.13.0"
 rustc-hash = "1.1.0"
 
 thiserror = "1.0"
+gc = { version = "0.4.1", features = ["derive"] }
 
 [dependencies.anyhow]
 version = "1.0"
modifiedcrates/jrsonnet-evaluator/src/builtin/format.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/format.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/format.rs
@@ -2,11 +2,12 @@
 #![allow(clippy::too_many_arguments)]
 
 use crate::{error::Error::*, throw, LocError, ObjValue, Result, Val};
+use gc::{Finalize, Trace};
 use jrsonnet_interner::IStr;
 use jrsonnet_types::ValType;
 use thiserror::Error;
 
-#[derive(Debug, Clone, Error)]
+#[derive(Debug, Clone, Error, Trace, Finalize)]
 pub enum FormatError {
 	#[error("truncated format code")]
 	TruncatedFormatCode,
modifiedcrates/jrsonnet-evaluator/src/builtin/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/manifest.rs
@@ -126,6 +126,7 @@
 			buf.push('}');
 		}
 		Val::Func(_) => throw!(RuntimeError("tried to manifest function".into())),
+		Val::DebugGcTraceValue(v) => manifest_json_ex_buf(&v.value, buf, cur_padding, options)?,
 	};
 	Ok(())
 }
modifiedcrates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/builtin/mod.rs
1use crate::{2	equals,3	error::{Error::*, Result},4	parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, EvaluationState,5	FuncVal, LazyVal, Val,6};7use format::{format_arr, format_obj};8use jrsonnet_interner::IStr;9use jrsonnet_parser::{ArgsDesc, BinaryOpType, ExprLocation};10use jrsonnet_types::ty;11use std::{collections::HashMap, path::PathBuf, rc::Rc};1213pub mod stdlib;14pub use stdlib::*;1516use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};1718pub mod format;19pub mod manifest;20pub mod sort;2122fn std_format(str: IStr, vals: Val) -> Result<Val> {23	push(24		Some(&ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)),25		|| format!("std.format of {}", str),26		|| {27			Ok(match vals {28				Val::Arr(vals) => Val::Str(format_arr(&str, &vals.evaluated()?)?.into()),29				Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),30				o => Val::Str(format_arr(&str, &[o])?.into()),31			})32		},33	)34}3536type Builtin = fn(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val>;3738type BuiltinsType = HashMap<Box<str>, Builtin>;3940thread_local! {41	static BUILTINS: BuiltinsType = {42		[43			("length".into(), builtin_length as Builtin),44			("type".into(), builtin_type),45			("makeArray".into(), builtin_make_array),46			("codepoint".into(), builtin_codepoint),47			("objectFieldsEx".into(), builtin_object_fields_ex),48			("objectHasEx".into(), builtin_object_has_ex),49			("slice".into(), builtin_slice),50			("primitiveEquals".into(), builtin_primitive_equals),51			("equals".into(), builtin_equals),52			("modulo".into(), builtin_modulo),53			("mod".into(), builtin_mod),54			("floor".into(), builtin_floor),55			("log".into(), builtin_log),56			("pow".into(), builtin_pow),57			("extVar".into(), builtin_ext_var),58			("native".into(), builtin_native),59			("filter".into(), builtin_filter),60			("map".into(), builtin_map),61			("foldl".into(), builtin_foldl),62			("foldr".into(), builtin_foldr),63			("sortImpl".into(), builtin_sort_impl),64			("format".into(), builtin_format),65			("range".into(), builtin_range),66			("char".into(), builtin_char),67			("encodeUTF8".into(), builtin_encode_utf8),68			("md5".into(), builtin_md5),69			("base64".into(), builtin_base64),70			("trace".into(), builtin_trace),71			("join".into(), builtin_join),72			("escapeStringJson".into(), builtin_escape_string_json),73			("manifestJsonEx".into(), builtin_manifest_json_ex),74			("reverse".into(), builtin_reverse),75			("id".into(), builtin_id),76			("strReplace".into(), builtin_str_replace),77			("parseJson".into(), builtin_parse_json),78		].iter().cloned().collect()79	};80}8182fn builtin_length(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {83	parse_args!(context, "length", args, 1, [84		0, x: ty!((string | object | array));85	], {86		Ok(match x {87			Val::Str(n) => Val::Num(n.chars().count() as f64),88			Val::Arr(a) => Val::Num(a.len() as f64),89			Val::Obj(o) => Val::Num(90				o.fields_visibility()91					.into_iter()92					.filter(|(_k, v)| *v)93					.count() as f64,94			),95			_ => unreachable!(),96		})97	})98}99100fn builtin_type(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {101	parse_args!(context, "type", args, 1, [102		0, x: ty!(any);103	], {104		Ok(Val::Str(x.value_type().name().into()))105	})106}107108fn builtin_make_array(109	context: Context,110	_loc: Option<&ExprLocation>,111	args: &ArgsDesc,112) -> Result<Val> {113	parse_args!(context, "makeArray", args, 2, [114		0, sz: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;115		1, func: ty!(function) => Val::Func;116	], {117		let mut out = Vec::with_capacity(sz as usize);118		for i in 0..sz as usize {119			out.push(LazyVal::new_resolved(func.evaluate_values(120				context.clone(),121				&[Val::Num(i as f64)]122			)?))123		}124		Ok(Val::Arr(out.into()))125	})126}127128fn builtin_codepoint(129	context: Context,130	_loc: Option<&ExprLocation>,131	args: &ArgsDesc,132) -> Result<Val> {133	parse_args!(context, "codepoint", args, 1, [134		0, str: ty!(char) => Val::Str;135	], {136		Ok(Val::Num(str.chars().next().unwrap() as u32 as f64))137	})138}139140fn builtin_object_fields_ex(141	context: Context,142	_loc: Option<&ExprLocation>,143	args: &ArgsDesc,144) -> Result<Val> {145	parse_args!(context, "objectFieldsEx", args, 2, [146		0, obj: ty!(object) => Val::Obj;147		1, inc_hidden: ty!(boolean) => Val::Bool;148	], {149		let out = obj.fields_ex(inc_hidden);150		Ok(Val::Arr(out.into_iter().map(Val::Str).collect::<Vec<_>>().into()))151	})152}153154fn builtin_object_has_ex(155	context: Context,156	_loc: Option<&ExprLocation>,157	args: &ArgsDesc,158) -> Result<Val> {159	parse_args!(context, "objectHasEx", args, 3, [160		0, obj: ty!(object) => Val::Obj;161		1, f: ty!(string) => Val::Str;162		2, inc_hidden: ty!(boolean) => Val::Bool;163	], {164		Ok(Val::Bool(obj.has_field_ex(f, inc_hidden)))165	})166}167168fn builtin_parse_json(169	context: Context,170	_loc: Option<&ExprLocation>,171	args: &ArgsDesc,172) -> Result<Val> {173	parse_args!(context, "parseJson", args, 1, [174		0, s: ty!(string) => Val::Str;175	], {176		let state = EvaluationState::default();177		let path = Rc::new(PathBuf::from("std.parseJson"));178		state.evaluate_snippet_raw(path ,s)179	})180}181182// faster183fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {184	parse_args!(context, "slice", args, 4, [185		0, indexable: ty!((string | array));186		1, index: ty!((number | null));187		2, end: ty!((number | null));188		3, step: ty!((number | null));189	], {190		let index = match index {191			Val::Num(v) => v as usize,192			Val::Null => 0,193			_ => unreachable!(),194		};195		let end = match end {196			Val::Num(v) => v as usize,197			Val::Null => match &indexable {198				Val::Str(s) => s.chars().count(),199				Val::Arr(v) => v.len(),200				_ => unreachable!()201			},202			_ => unreachable!()203		};204		let step = match step {205			Val::Num(v) => v as usize,206			Val::Null => 1,207			_ => unreachable!()208		};209		match &indexable {210			Val::Str(s) => {211				Ok(Val::Str((s.chars().skip(index).take(end-index).step_by(step).collect::<String>()).into()))212			}213			Val::Arr(arr) => {214				Ok(Val::Arr((arr.iter().skip(index).take(end-index).step_by(step).collect::<Result<Vec<Val>>>()?).into()))215			}216			_ => unreachable!()217		}218	})219}220221// faster222fn builtin_primitive_equals(223	context: Context,224	_loc: Option<&ExprLocation>,225	args: &ArgsDesc,226) -> Result<Val> {227	parse_args!(context, "primitiveEquals", args, 2, [228		0, a: ty!(any);229		1, b: ty!(any);230	], {231		Ok(Val::Bool(primitive_equals(&a, &b)?))232	})233}234235// faster236fn builtin_equals(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {237	parse_args!(context, "equals", args, 2, [238		0, a: ty!(any);239		1, b: ty!(any);240	], {241		Ok(Val::Bool(equals(&a, &b)?))242	})243}244245fn builtin_modulo(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {246	parse_args!(context, "modulo", args, 2, [247		0, a: ty!(number) => Val::Num;248		1, b: ty!(number) => Val::Num;249	], {250		Ok(Val::Num(a % b))251	})252}253254fn builtin_mod(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {255	parse_args!(context, "mod", args, 2, [256		0, a: ty!((number | string));257		1, b: ty!(any);258	], {259		match (a, b) {260			(Val::Num(a), Val::Num(b)) => Ok(Val::Num(a % b)),261			(Val::Str(str), vals) => std_format(str, vals),262			(a, b) => throw!(BinaryOperatorDoesNotOperateOnValues(BinaryOpType::Mod, a.value_type(), b.value_type()))263		}264	})265}266267fn builtin_floor(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {268	parse_args!(context, "floor", args, 1, [269		0, x: ty!(number) => Val::Num;270	], {271		Ok(Val::Num(x.floor()))272	})273}274275fn builtin_log(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {276	parse_args!(context, "log", args, 1, [277		0, n: ty!(number) => Val::Num;278	], {279		Ok(Val::Num(n.ln()))280	})281}282283fn builtin_pow(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {284	parse_args!(context, "pow", args, 2, [285		0, x: ty!(number) => Val::Num;286		1, n: ty!(number) => Val::Num;287	], {288		Ok(Val::Num(x.powf(n)))289	})290}291292fn builtin_ext_var(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {293	parse_args!(context, "extVar", args, 1, [294		0, x: ty!(string) => Val::Str;295	], {296		Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)297	})298}299300fn builtin_native(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {301	parse_args!(context, "native", args, 1, [302		0, x: ty!(string) => Val::Str;303	], {304		Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Rc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or(UndefinedExternalFunction(x))?)305	})306}307308fn builtin_filter(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {309	parse_args!(context, "filter", args, 2, [310		0, func: ty!(function) => Val::Func;311		1, arr: ty!(array) => Val::Arr;312	], {313		Ok(Val::Arr(arr.filter(|val| func314			.evaluate_values(context.clone(), &[val.clone()])?315			.try_cast_bool("filter predicate"))?))316	})317}318319fn builtin_map(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {320	parse_args!(context, "map", args, 2, [321		0, func: ty!(function) => Val::Func;322		1, arr: ty!(array) => Val::Arr;323	], {324		Ok(Val::Arr(arr.map(|val| func325			.evaluate_values(context.clone(), &[val]))?))326	})327}328329fn builtin_foldl(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {330	parse_args!(context, "foldl", args, 3, [331		0, func: ty!(function) => Val::Func;332		1, arr: ty!(array) => Val::Arr;333		2, init: ty!(any);334	], {335		let mut acc = init;336		for i in arr.iter() {337			acc = func.evaluate_values(context.clone(), &[acc, i?])?;338		}339		Ok(acc)340	})341}342343fn builtin_foldr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {344	parse_args!(context, "foldr", args, 3, [345		0, func: ty!(function) => Val::Func;346		1, arr: ty!(array) => Val::Arr;347		2, init: ty!(any);348	], {349		let mut acc = init;350		for i in arr.iter().rev() {351			acc = func.evaluate_values(context.clone(), &[acc, i?])?;352		}353		Ok(acc)354	})355}356357#[allow(non_snake_case)]358fn builtin_sort_impl(359	context: Context,360	_loc: Option<&ExprLocation>,361	args: &ArgsDesc,362) -> Result<Val> {363	parse_args!(context, "sort", args, 2, [364		0, arr: ty!(array) => Val::Arr;365		1, keyF: ty!(function) => Val::Func;366	], {367		if arr.len() <= 1 {368			return Ok(Val::Arr(arr))369		}370		Ok(Val::Arr(ArrValue::Eager(sort::sort(context, arr.evaluated()?, &keyF)?)))371	})372}373374// faster375fn builtin_format(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {376	parse_args!(context, "format", args, 2, [377		0, str: ty!(string) => Val::Str;378		1, vals: ty!(any)379	], {380		std_format(str, vals)381	})382}383384fn builtin_range(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {385	parse_args!(context, "range", args, 2, [386		0, from: ty!(number) => Val::Num;387		1, to: ty!(number) => Val::Num;388	], {389		if to < from {390			return Ok(Val::Arr(ArrValue::new_eager()))391		}392		let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));393		for i in from as usize..=to as usize {394			out.push(Val::Num(i as f64));395		}396		Ok(Val::Arr(out.into()))397	})398}399400fn builtin_char(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {401	parse_args!(context, "char", args, 1, [402		0, n: ty!(number) => Val::Num;403	], {404		let mut out = String::new();405		out.push(std::char::from_u32(n as u32).ok_or_else(||406			InvalidUnicodeCodepointGot(n as u32)407		)?);408		Ok(Val::Str(out.into()))409	})410}411412fn builtin_encode_utf8(413	context: Context,414	_loc: Option<&ExprLocation>,415	args: &ArgsDesc,416) -> Result<Val> {417	parse_args!(context, "encodeUTF8", args, 1, [418		0, str: ty!(string) => Val::Str;419	], {420		Ok(Val::Arr((str.bytes().map(|b| Val::Num(b as f64)).collect::<Vec<Val>>()).into()))421	})422}423424fn builtin_md5(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {425	parse_args!(context, "md5", args, 1, [426		0, str: ty!(string) => Val::Str;427	], {428		Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))429	})430}431432fn builtin_trace(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {433	parse_args!(context, "trace", args, 2, [434		0, str: ty!(string) => Val::Str;435		1, rest: ty!(any);436	], {437		eprint!("TRACE:");438		if let Some(loc) = loc {439			with_state(|s|{440				let locs = s.map_source_locations(&loc.0, &[loc.1]);441				eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);442			});443		}444		eprintln!(" {}", str);445		Ok(rest)446	})447}448449fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {450	parse_args!(context, "base64", args, 1, [451		0, input: ty!((string | (Array<number>)));452	], {453		Ok(Val::Str(match input {454			Val::Str(s) => {455				base64::encode(s.bytes().collect::<Vec<_>>()).into()456			},457			Val::Arr(a) => {458				base64::encode(a.iter().map(|v| {459					Ok(v?.unwrap_num()? as u8)460				}).collect::<Result<Vec<_>>>()?).into()461			},462			_ => unreachable!()463		}))464	})465}466467fn builtin_join(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {468	parse_args!(context, "join", args, 2, [469		0, sep: ty!((string | array));470		1, arr: ty!(array) => Val::Arr;471	], {472		Ok(match sep {473			Val::Arr(joiner_items) => {474				let mut out = Vec::new();475476				let mut first = true;477				for item in arr.iter() {478					let item = item?.clone();479					if let Val::Arr(items) = item {480						if !first {481							out.reserve(joiner_items.len());482							// TODO: extend483							for item in joiner_items.iter() {484								out.push(item?);485							}486						}487						first = false;488						out.reserve(items.len());489						// TODO: extend490						for item in items.iter() {491							out.push(item?);492						}493					} else {494						throw!(RuntimeError("in std.join all items should be arrays".into()));495					}496				}497498				Val::Arr(out.into())499			},500			Val::Str(sep) => {501				let mut out = String::new();502503				let mut first = true;504				for item in arr.iter() {505					let item = item?.clone();506					if let Val::Str(item) = item {507						if !first {508							out += &sep;509						}510						first = false;511						out += &item;512					} else {513						throw!(RuntimeError("in std.join all items should be strings".into()));514					}515				}516517				Val::Str(out.into())518			},519			_ => unreachable!()520		})521	})522}523524// faster525fn builtin_escape_string_json(526	context: Context,527	_loc: Option<&ExprLocation>,528	args: &ArgsDesc,529) -> Result<Val> {530	parse_args!(context, "escapeStringJson", args, 1, [531		0, str_: ty!(string) => Val::Str;532	], {533		Ok(Val::Str(escape_string_json(&str_).into()))534	})535}536537// faster538fn builtin_manifest_json_ex(539	context: Context,540	_loc: Option<&ExprLocation>,541	args: &ArgsDesc,542) -> Result<Val> {543	parse_args!(context, "manifestJsonEx", args, 2, [544		0, value: ty!(any);545		1, indent: ty!(string) => Val::Str;546	], {547		Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {548			padding: &indent,549			mtype: ManifestType::Std,550		})?.into()))551	})552}553554// faster555fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {556	parse_args!(context, "reverse", args, 1, [557		0, value: ty!(array) => Val::Arr;558	], {559		Ok(Val::Arr(value.reversed()))560	})561}562563fn builtin_id(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {564	parse_args!(context, "id", args, 1, [565		0, v: ty!(any);566	], {567		Ok(v)568	})569}570571// faster572fn builtin_str_replace(573	context: Context,574	_loc: Option<&ExprLocation>,575	args: &ArgsDesc,576) -> Result<Val> {577	parse_args!(context, "strReplace", args, 3, [578		0, str: ty!(string) => Val::Str;579		1, from: ty!(string) => Val::Str;580		2, to: ty!(string) => Val::Str;581	], {582		let mut out = String::new();583		let mut last_idx = 0;584		while let Some(idx) = (&str[last_idx..]).find(&from as &str) {585			out.push_str(&str[last_idx..last_idx+idx]);586			out.push_str(&to);587			last_idx += idx + from.len();588		}589		if last_idx == 0 {590			return Ok(Val::Str(str))591		}592		out.push_str(&str[last_idx..]);593		Ok(Val::Str(out.into()))594	})595}596597pub fn call_builtin(598	context: Context,599	loc: Option<&ExprLocation>,600	name: &str,601	args: &ArgsDesc,602) -> Result<Val> {603	BUILTINS604		.with(|builtins| builtins.get(name).copied())605		.ok_or_else(|| IntrinsicNotFound(name.into()))?(context, loc, args)606}
after · crates/jrsonnet-evaluator/src/builtin/mod.rs
1use crate::{2	equals,3	error::{Error::*, Result},4	parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, DebugGcTraceValue,5	EvaluationState, FuncVal, LazyVal, Val,6};7use format::{format_arr, format_obj};8use gc::Gc;9use jrsonnet_interner::IStr;10use jrsonnet_parser::{ArgsDesc, BinaryOpType, ExprLocation};11use jrsonnet_types::ty;12use std::{collections::HashMap, path::PathBuf, rc::Rc};1314pub mod stdlib;15pub use stdlib::*;1617use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};1819pub mod format;20pub mod manifest;21pub mod sort;2223fn std_format(str: IStr, vals: Val) -> Result<Val> {24	push(25		Some(&ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)),26		|| format!("std.format of {}", str),27		|| {28			Ok(match vals {29				Val::Arr(vals) => Val::Str(format_arr(&str, &vals.evaluated()?)?.into()),30				Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),31				o => Val::Str(format_arr(&str, &[o])?.into()),32			})33		},34	)35}3637type Builtin = fn(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val>;3839type BuiltinsType = HashMap<Box<str>, Builtin>;4041thread_local! {42	static BUILTINS: BuiltinsType = {43		[44			("length".into(), builtin_length as Builtin),45			("type".into(), builtin_type),46			("makeArray".into(), builtin_make_array),47			("codepoint".into(), builtin_codepoint),48			("objectFieldsEx".into(), builtin_object_fields_ex),49			("objectHasEx".into(), builtin_object_has_ex),50			("slice".into(), builtin_slice),51			("primitiveEquals".into(), builtin_primitive_equals),52			("equals".into(), builtin_equals),53			("modulo".into(), builtin_modulo),54			("mod".into(), builtin_mod),55			("floor".into(), builtin_floor),56			("log".into(), builtin_log),57			("pow".into(), builtin_pow),58			("extVar".into(), builtin_ext_var),59			("native".into(), builtin_native),60			("filter".into(), builtin_filter),61			("map".into(), builtin_map),62			("foldl".into(), builtin_foldl),63			("foldr".into(), builtin_foldr),64			("sortImpl".into(), builtin_sort_impl),65			("format".into(), builtin_format),66			("range".into(), builtin_range),67			("char".into(), builtin_char),68			("encodeUTF8".into(), builtin_encode_utf8),69			("md5".into(), builtin_md5),70			("base64".into(), builtin_base64),71			("trace".into(), builtin_trace),72			("gc".into(), builtin_gc),73			("gcTrace".into(), builtin_gc_trace),74			("join".into(), builtin_join),75			("escapeStringJson".into(), builtin_escape_string_json),76			("manifestJsonEx".into(), builtin_manifest_json_ex),77			("reverse".into(), builtin_reverse),78			("id".into(), builtin_id),79			("strReplace".into(), builtin_str_replace),80			("parseJson".into(), builtin_parse_json),81		].iter().cloned().collect()82	};83}8485fn builtin_length(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {86	parse_args!(context, "length", args, 1, [87		0, x: ty!((string | object | array));88	], {89		Ok(match x {90			Val::Str(n) => Val::Num(n.chars().count() as f64),91			Val::Arr(a) => Val::Num(a.len() as f64),92			Val::Obj(o) => Val::Num(93				o.fields_visibility()94					.into_iter()95					.filter(|(_k, v)| *v)96					.count() as f64,97			),98			_ => unreachable!(),99		})100	})101}102103fn builtin_type(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {104	parse_args!(context, "type", args, 1, [105		0, x: ty!(any);106	], {107		Ok(Val::Str(x.value_type().name().into()))108	})109}110111fn builtin_make_array(112	context: Context,113	_loc: Option<&ExprLocation>,114	args: &ArgsDesc,115) -> Result<Val> {116	parse_args!(context, "makeArray", args, 2, [117		0, sz: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;118		1, func: ty!(function) => Val::Func;119	], {120		let mut out = Vec::with_capacity(sz as usize);121		for i in 0..sz as usize {122			out.push(LazyVal::new_resolved(func.evaluate_values(123				context.clone(),124				&[Val::Num(i as f64)]125			)?))126		}127		Ok(Val::Arr(out.into()))128	})129}130131fn builtin_codepoint(132	context: Context,133	_loc: Option<&ExprLocation>,134	args: &ArgsDesc,135) -> Result<Val> {136	parse_args!(context, "codepoint", args, 1, [137		0, str: ty!(char) => Val::Str;138	], {139		Ok(Val::Num(str.chars().next().unwrap() as u32 as f64))140	})141}142143fn builtin_object_fields_ex(144	context: Context,145	_loc: Option<&ExprLocation>,146	args: &ArgsDesc,147) -> Result<Val> {148	parse_args!(context, "objectFieldsEx", args, 2, [149		0, obj: ty!(object) => Val::Obj;150		1, inc_hidden: ty!(boolean) => Val::Bool;151	], {152		let out = obj.fields_ex(inc_hidden);153		Ok(Val::Arr(out.into_iter().map(Val::Str).collect::<Vec<_>>().into()))154	})155}156157fn builtin_object_has_ex(158	context: Context,159	_loc: Option<&ExprLocation>,160	args: &ArgsDesc,161) -> Result<Val> {162	parse_args!(context, "objectHasEx", args, 3, [163		0, obj: ty!(object) => Val::Obj;164		1, f: ty!(string) => Val::Str;165		2, inc_hidden: ty!(boolean) => Val::Bool;166	], {167		Ok(Val::Bool(obj.has_field_ex(f, inc_hidden)))168	})169}170171fn builtin_parse_json(172	context: Context,173	_loc: Option<&ExprLocation>,174	args: &ArgsDesc,175) -> Result<Val> {176	parse_args!(context, "parseJson", args, 1, [177		0, s: ty!(string) => Val::Str;178	], {179		let state = EvaluationState::default();180		let path = Rc::new(PathBuf::from("std.parseJson"));181		state.evaluate_snippet_raw(path ,s)182	})183}184185// faster186fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {187	parse_args!(context, "slice", args, 4, [188		0, indexable: ty!((string | array));189		1, index: ty!((number | null));190		2, end: ty!((number | null));191		3, step: ty!((number | null));192	], {193		let index = match index {194			Val::Num(v) => v as usize,195			Val::Null => 0,196			_ => unreachable!(),197		};198		let end = match end {199			Val::Num(v) => v as usize,200			Val::Null => match &indexable {201				Val::Str(s) => s.chars().count(),202				Val::Arr(v) => v.len(),203				_ => unreachable!()204			},205			_ => unreachable!()206		};207		let step = match step {208			Val::Num(v) => v as usize,209			Val::Null => 1,210			_ => unreachable!()211		};212		match &indexable {213			Val::Str(s) => {214				Ok(Val::Str((s.chars().skip(index).take(end-index).step_by(step).collect::<String>()).into()))215			}216			Val::Arr(arr) => {217				Ok(Val::Arr((arr.iter().skip(index).take(end-index).step_by(step).collect::<Result<Vec<Val>>>()?).into()))218			}219			_ => unreachable!()220		}221	})222}223224// faster225fn builtin_primitive_equals(226	context: Context,227	_loc: Option<&ExprLocation>,228	args: &ArgsDesc,229) -> Result<Val> {230	parse_args!(context, "primitiveEquals", args, 2, [231		0, a: ty!(any);232		1, b: ty!(any);233	], {234		Ok(Val::Bool(primitive_equals(&a, &b)?))235	})236}237238// faster239fn builtin_equals(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {240	parse_args!(context, "equals", args, 2, [241		0, a: ty!(any);242		1, b: ty!(any);243	], {244		Ok(Val::Bool(equals(&a, &b)?))245	})246}247248fn builtin_modulo(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {249	parse_args!(context, "modulo", args, 2, [250		0, a: ty!(number) => Val::Num;251		1, b: ty!(number) => Val::Num;252	], {253		Ok(Val::Num(a % b))254	})255}256257fn builtin_mod(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {258	parse_args!(context, "mod", args, 2, [259		0, a: ty!((number | string));260		1, b: ty!(any);261	], {262		match (a, b) {263			(Val::Num(a), Val::Num(b)) => Ok(Val::Num(a % b)),264			(Val::Str(str), vals) => std_format(str, vals),265			(a, b) => throw!(BinaryOperatorDoesNotOperateOnValues(BinaryOpType::Mod, a.value_type(), b.value_type()))266		}267	})268}269270fn builtin_floor(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {271	parse_args!(context, "floor", args, 1, [272		0, x: ty!(number) => Val::Num;273	], {274		Ok(Val::Num(x.floor()))275	})276}277278fn builtin_log(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {279	parse_args!(context, "log", args, 1, [280		0, n: ty!(number) => Val::Num;281	], {282		Ok(Val::Num(n.ln()))283	})284}285286fn builtin_pow(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {287	parse_args!(context, "pow", args, 2, [288		0, x: ty!(number) => Val::Num;289		1, n: ty!(number) => Val::Num;290	], {291		Ok(Val::Num(x.powf(n)))292	})293}294295fn builtin_ext_var(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {296	parse_args!(context, "extVar", args, 1, [297		0, x: ty!(string) => Val::Str;298	], {299		Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)300	})301}302303fn builtin_native(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {304	parse_args!(context, "native", args, 1, [305		0, x: ty!(string) => Val::Str;306	], {307		Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Gc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or(UndefinedExternalFunction(x))?)308	})309}310311fn builtin_filter(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {312	parse_args!(context, "filter", args, 2, [313		0, func: ty!(function) => Val::Func;314		1, arr: ty!(array) => Val::Arr;315	], {316		Ok(Val::Arr(arr.filter(|val| func317			.evaluate_values(context.clone(), &[val.clone()])?318			.try_cast_bool("filter predicate"))?))319	})320}321322fn builtin_map(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {323	parse_args!(context, "map", args, 2, [324		0, func: ty!(function) => Val::Func;325		1, arr: ty!(array) => Val::Arr;326	], {327		Ok(Val::Arr(arr.map(|val| func328			.evaluate_values(context.clone(), &[val]))?))329	})330}331332fn builtin_foldl(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {333	parse_args!(context, "foldl", args, 3, [334		0, func: ty!(function) => Val::Func;335		1, arr: ty!(array) => Val::Arr;336		2, init: ty!(any);337	], {338		let mut acc = init;339		for i in arr.iter() {340			acc = func.evaluate_values(context.clone(), &[acc, i?])?;341		}342		Ok(acc)343	})344}345346fn builtin_foldr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {347	parse_args!(context, "foldr", args, 3, [348		0, func: ty!(function) => Val::Func;349		1, arr: ty!(array) => Val::Arr;350		2, init: ty!(any);351	], {352		let mut acc = init;353		for i in arr.iter().rev() {354			acc = func.evaluate_values(context.clone(), &[acc, i?])?;355		}356		Ok(acc)357	})358}359360#[allow(non_snake_case)]361fn builtin_sort_impl(362	context: Context,363	_loc: Option<&ExprLocation>,364	args: &ArgsDesc,365) -> Result<Val> {366	parse_args!(context, "sort", args, 2, [367		0, arr: ty!(array) => Val::Arr;368		1, keyF: ty!(function) => Val::Func;369	], {370		if arr.len() <= 1 {371			return Ok(Val::Arr(arr))372		}373		Ok(Val::Arr(ArrValue::Eager(sort::sort(context, arr.evaluated()?, &keyF)?)))374	})375}376377// faster378fn builtin_format(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {379	parse_args!(context, "format", args, 2, [380		0, str: ty!(string) => Val::Str;381		1, vals: ty!(any)382	], {383		std_format(str, vals)384	})385}386387fn builtin_range(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {388	parse_args!(context, "range", args, 2, [389		0, from: ty!(number) => Val::Num;390		1, to: ty!(number) => Val::Num;391	], {392		if to < from {393			return Ok(Val::Arr(ArrValue::new_eager()))394		}395		let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));396		for i in from as usize..=to as usize {397			out.push(Val::Num(i as f64));398		}399		Ok(Val::Arr(out.into()))400	})401}402403fn builtin_char(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {404	parse_args!(context, "char", args, 1, [405		0, n: ty!(number) => Val::Num;406	], {407		let mut out = String::new();408		out.push(std::char::from_u32(n as u32).ok_or_else(||409			InvalidUnicodeCodepointGot(n as u32)410		)?);411		Ok(Val::Str(out.into()))412	})413}414415fn builtin_encode_utf8(416	context: Context,417	_loc: Option<&ExprLocation>,418	args: &ArgsDesc,419) -> Result<Val> {420	parse_args!(context, "encodeUTF8", args, 1, [421		0, str: ty!(string) => Val::Str;422	], {423		Ok(Val::Arr((str.bytes().map(|b| Val::Num(b as f64)).collect::<Vec<Val>>()).into()))424	})425}426427fn builtin_md5(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {428	parse_args!(context, "md5", args, 1, [429		0, str: ty!(string) => Val::Str;430	], {431		Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))432	})433}434435fn builtin_trace(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {436	parse_args!(context, "trace", args, 2, [437		0, str: ty!(string) => Val::Str;438		1, rest: ty!(any);439	], {440		eprint!("TRACE:");441		if let Some(loc) = loc {442			with_state(|s|{443				let locs = s.map_source_locations(&loc.0, &[loc.1]);444				eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);445			});446		}447		eprintln!(" {}", str);448		Ok(rest)449	})450}451452fn builtin_gc(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {453	parse_args!(context, "gc", args, 1, [454		0, rest: ty!(any);455	], {456		println!("GC start");457		gc::force_collect();458		println!("GC done");459460		Ok(rest)461	})462}463464fn builtin_gc_trace(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {465	parse_args!(context, "gcTrace", args, 2, [466		0, name: ty!(string) => Val::Str;467		1, rest: ty!(any);468	], {469470		Ok(DebugGcTraceValue::new(name, rest))471	})472}473474fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {475	parse_args!(context, "base64", args, 1, [476		0, input: ty!((string | (Array<number>)));477	], {478		Ok(Val::Str(match input {479			Val::Str(s) => {480				base64::encode(s.bytes().collect::<Vec<_>>()).into()481			},482			Val::Arr(a) => {483				base64::encode(a.iter().map(|v| {484					Ok(v?.unwrap_num()? as u8)485				}).collect::<Result<Vec<_>>>()?).into()486			},487			_ => unreachable!()488		}))489	})490}491492fn builtin_join(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {493	parse_args!(context, "join", args, 2, [494		0, sep: ty!((string | array));495		1, arr: ty!(array) => Val::Arr;496	], {497		Ok(match sep {498			Val::Arr(joiner_items) => {499				let mut out = Vec::new();500501				let mut first = true;502				for item in arr.iter() {503					let item = item?.clone();504					if let Val::Arr(items) = item {505						if !first {506							out.reserve(joiner_items.len());507							// TODO: extend508							for item in joiner_items.iter() {509								out.push(item?);510							}511						}512						first = false;513						out.reserve(items.len());514						// TODO: extend515						for item in items.iter() {516							out.push(item?);517						}518					} else {519						throw!(RuntimeError("in std.join all items should be arrays".into()));520					}521				}522523				Val::Arr(out.into())524			},525			Val::Str(sep) => {526				let mut out = String::new();527528				let mut first = true;529				for item in arr.iter() {530					let item = item?.clone();531					if let Val::Str(item) = item {532						if !first {533							out += &sep;534						}535						first = false;536						out += &item;537					} else {538						throw!(RuntimeError("in std.join all items should be strings".into()));539					}540				}541542				Val::Str(out.into())543			},544			_ => unreachable!()545		})546	})547}548549// faster550fn builtin_escape_string_json(551	context: Context,552	_loc: Option<&ExprLocation>,553	args: &ArgsDesc,554) -> Result<Val> {555	parse_args!(context, "escapeStringJson", args, 1, [556		0, str_: ty!(string) => Val::Str;557	], {558		Ok(Val::Str(escape_string_json(&str_).into()))559	})560}561562// faster563fn builtin_manifest_json_ex(564	context: Context,565	_loc: Option<&ExprLocation>,566	args: &ArgsDesc,567) -> Result<Val> {568	parse_args!(context, "manifestJsonEx", args, 2, [569		0, value: ty!(any);570		1, indent: ty!(string) => Val::Str;571	], {572		Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {573			padding: &indent,574			mtype: ManifestType::Std,575		})?.into()))576	})577}578579// faster580fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {581	parse_args!(context, "reverse", args, 1, [582		0, value: ty!(array) => Val::Arr;583	], {584		Ok(Val::Arr(value.reversed()))585	})586}587588fn builtin_id(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {589	parse_args!(context, "id", args, 1, [590		0, v: ty!(any);591	], {592		Ok(v)593	})594}595596// faster597fn builtin_str_replace(598	context: Context,599	_loc: Option<&ExprLocation>,600	args: &ArgsDesc,601) -> Result<Val> {602	parse_args!(context, "strReplace", args, 3, [603		0, str: ty!(string) => Val::Str;604		1, from: ty!(string) => Val::Str;605		2, to: ty!(string) => Val::Str;606	], {607		let mut out = String::new();608		let mut last_idx = 0;609		while let Some(idx) = (&str[last_idx..]).find(&from as &str) {610			out.push_str(&str[last_idx..last_idx+idx]);611			out.push_str(&to);612			last_idx += idx + from.len();613		}614		if last_idx == 0 {615			return Ok(Val::Str(str))616		}617		out.push_str(&str[last_idx..]);618		Ok(Val::Str(out.into()))619	})620}621622pub fn call_builtin(623	context: Context,624	loc: Option<&ExprLocation>,625	name: &str,626	args: &ArgsDesc,627) -> Result<Val> {628	BUILTINS629		.with(|builtins| builtins.get(name).copied())630		.ok_or_else(|| IntrinsicNotFound(name.into()))?(context, loc, args)631}
modifiedcrates/jrsonnet-evaluator/src/builtin/sort.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/sort.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/sort.rs
@@ -2,9 +2,9 @@
 	error::{Error, LocError, Result},
 	throw, Context, FuncVal, Val,
 };
-use std::rc::Rc;
+use gc::{Finalize, Gc, Trace};
 
-#[derive(Debug, Clone, thiserror::Error)]
+#[derive(Debug, Clone, thiserror::Error, Trace, Finalize)]
 pub enum SortError {
 	#[error("sort key should be string or number")]
 	SortKeyShouldBeStringOrNumber,
@@ -59,13 +59,13 @@
 	Ok(sort_type)
 }
 
-pub fn sort(ctx: Context, mut values: Rc<Vec<Val>>, key_getter: &FuncVal) -> Result<Rc<Vec<Val>>> {
+pub fn sort(ctx: Context, values: Gc<Vec<Val>>, key_getter: &FuncVal) -> Result<Gc<Vec<Val>>> {
 	if values.len() <= 1 {
 		return Ok(values);
 	}
 	if key_getter.is_ident() {
-		let mvalues = Rc::make_mut(&mut values);
-		let sort_type = get_sort_type(mvalues, |k| k)?;
+		let mut mvalues = (*values).clone();
+		let sort_type = get_sort_type(&mut mvalues, |k| k)?;
 		match sort_type {
 			SortKeyType::Number => mvalues.sort_by_key(|v| match v {
 				Val::Num(n) => NonNaNf64(*n),
@@ -77,7 +77,7 @@
 			}),
 			SortKeyType::Unknown => unreachable!(),
 		};
-		Ok(values)
+		Ok(Gc::new(mvalues))
 	} else {
 		let mut vk = Vec::with_capacity(values.len());
 		for value in values.iter() {
@@ -98,6 +98,6 @@
 			}),
 			SortKeyType::Unknown => unreachable!(),
 		};
-		Ok(Rc::new(vk.into_iter().map(|v| v.0).collect()))
+		Ok(Gc::new(vk.into_iter().map(|v| v.0).collect()))
 	}
 }
modifiedcrates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/ctx.rs
+++ b/crates/jrsonnet-evaluator/src/ctx.rs
@@ -1,13 +1,14 @@
 use crate::{
-	error::Error::*, map::LayeredHashMap, resolved_lazy_val, FutureWrapper, LazyBinding, LazyVal,
-	ObjValue, Result, Val,
+	error::Error::*, map::LayeredHashMap, FutureWrapper, LazyBinding, LazyVal, ObjValue, Result,
+	Val,
 };
+use gc::{Finalize, Gc, Trace};
 use jrsonnet_interner::IStr;
 use rustc_hash::FxHashMap;
+use std::fmt::Debug;
 use std::hash::BuildHasherDefault;
-use std::{fmt::Debug, rc::Rc};
 
-#[derive(Clone)]
+#[derive(Clone, Trace, Finalize)]
 pub struct ContextCreator(pub Context, pub FutureWrapper<FxHashMap<IStr, LazyBinding>>);
 impl ContextCreator {
 	pub fn create(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<Context> {
@@ -20,6 +21,7 @@
 	}
 }
 
+#[derive(Trace, Finalize)]
 struct ContextInternals {
 	dollar: Option<ObjValue>,
 	this: Option<ObjValue>,
@@ -28,15 +30,12 @@
 }
 impl Debug for ContextInternals {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-		f.debug_struct("Context")
-			.field("this", &self.this.as_ref().map(|e| Rc::as_ptr(&e.0)))
-			.field("bindings", &self.bindings)
-			.finish()
+		f.debug_struct("Context").finish()
 	}
 }
 
-#[derive(Debug, Clone)]
-pub struct Context(Rc<ContextInternals>);
+#[derive(Debug, Clone, Trace, Finalize)]
+pub struct Context(Gc<ContextInternals>);
 impl Context {
 	pub fn new_future() -> FutureWrapper<Self> {
 		FutureWrapper::new()
@@ -55,7 +54,7 @@
 	}
 
 	pub fn new() -> Self {
-		Self(Rc::new(ContextInternals {
+		Self(Gc::new(ContextInternals {
 			dollar: None,
 			this: None,
 			super_obj: None,
@@ -81,7 +80,7 @@
 	pub fn with_var(self, name: IStr, value: Val) -> Self {
 		let mut new_bindings =
 			FxHashMap::with_capacity_and_hasher(1, BuildHasherDefault::default());
-		new_bindings.insert(name, resolved_lazy_val!(value));
+		new_bindings.insert(name, LazyVal::new_resolved(value));
 		self.extend(new_bindings, None, None, None)
 	}
 
@@ -96,40 +95,21 @@
 		new_this: Option<ObjValue>,
 		new_super_obj: Option<ObjValue>,
 	) -> Self {
-		match Rc::try_unwrap(self.0) {
-			Ok(mut ctx) => {
-				// Extended context aren't used by anything else, we can freely mutate it without cloning
-				if let Some(dollar) = new_dollar {
-					ctx.dollar = Some(dollar);
-				}
-				if let Some(this) = new_this {
-					ctx.this = Some(this);
-				}
-				if let Some(super_obj) = new_super_obj {
-					ctx.super_obj = Some(super_obj);
-				}
-				if !new_bindings.is_empty() {
-					ctx.bindings = ctx.bindings.extend(new_bindings);
-				}
-				Self(Rc::new(ctx))
-			}
-			Err(ctx) => {
-				let dollar = new_dollar.or_else(|| ctx.dollar.clone());
-				let this = new_this.or_else(|| ctx.this.clone());
-				let super_obj = new_super_obj.or_else(|| ctx.super_obj.clone());
-				let bindings = if new_bindings.is_empty() {
-					ctx.bindings.clone()
-				} else {
-					ctx.bindings.clone().extend(new_bindings)
-				};
-				Self(Rc::new(ContextInternals {
-					dollar,
-					this,
-					super_obj,
-					bindings,
-				}))
-			}
-		}
+		let ctx = &self.0;
+		let dollar = new_dollar.or_else(|| ctx.dollar.clone());
+		let this = new_this.or_else(|| ctx.this.clone());
+		let super_obj = new_super_obj.or_else(|| ctx.super_obj.clone());
+		let bindings = if new_bindings.is_empty() {
+			ctx.bindings.clone()
+		} else {
+			ctx.bindings.clone().extend(new_bindings)
+		};
+		Self(Gc::new(ContextInternals {
+			dollar,
+			this,
+			super_obj,
+			bindings,
+		}))
 	}
 	pub fn extend_bound(self, new_bindings: FxHashMap<IStr, LazyVal>) -> Self {
 		let new_this = self.0.this.clone();
@@ -166,22 +146,6 @@
 
 impl PartialEq for Context {
 	fn eq(&self, other: &Self) -> bool {
-		Rc::ptr_eq(&self.0, &other.0)
-	}
-}
-
-#[cfg(feature = "unstable")]
-#[derive(Debug, Clone)]
-pub struct WeakContext(std::rc::Weak<ContextInternals>);
-#[cfg(feature = "unstable")]
-impl WeakContext {
-	pub fn upgrade(&self) -> Context {
-		Context(self.0.upgrade().expect("context is removed"))
-	}
-}
-#[cfg(feature = "unstable")]
-impl PartialEq for WeakContext {
-	fn eq(&self, other: &Self) -> bool {
-		self.0.ptr_eq(&other.0)
+		Gc::ptr_eq(&self.0, &other.0)
 	}
 }
modifiedcrates/jrsonnet-evaluator/src/dynamic.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/dynamic.rs
+++ b/crates/jrsonnet-evaluator/src/dynamic.rs
@@ -1,23 +1,23 @@
-use std::{cell::RefCell, rc::Rc};
+use gc::{Finalize, Gc, GcCell, Trace};
 
-#[derive(Clone)]
-pub struct FutureWrapper<V>(pub Rc<RefCell<Option<V>>>);
-impl<T> FutureWrapper<T> {
+#[derive(Clone, Trace, Finalize)]
+pub struct FutureWrapper<V: Trace + 'static>(pub Gc<GcCell<Option<V>>>);
+impl<T: Trace + 'static> FutureWrapper<T> {
 	pub fn new() -> Self {
-		Self(Rc::new(RefCell::new(None)))
+		Self(Gc::new(GcCell::new(None)))
 	}
 	pub fn fill(self, value: T) {
 		assert!(self.0.borrow().is_none(), "wrapper is filled already");
 		self.0.borrow_mut().replace(value);
 	}
 }
-impl<T: Clone> FutureWrapper<T> {
+impl<T: Clone + Trace + 'static> FutureWrapper<T> {
 	pub fn unwrap(&self) -> T {
 		self.0.borrow().as_ref().cloned().unwrap()
 	}
 }
 
-impl<T> Default for FutureWrapper<T> {
+impl<T: Trace + 'static> Default for FutureWrapper<T> {
 	fn default() -> Self {
 		Self::new()
 	}
modifiedcrates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -2,13 +2,14 @@
 	builtin::{format::FormatError, sort::SortError},
 	typed::TypeLocError,
 };
+use gc::{Finalize, Trace};
 use jrsonnet_interner::IStr;
 use jrsonnet_parser::{BinaryOpType, ExprLocation, UnaryOpType};
 use jrsonnet_types::ValType;
 use std::{path::PathBuf, rc::Rc};
 use thiserror::Error;
 
-#[derive(Error, Debug, Clone)]
+#[derive(Error, Debug, Clone, Trace, Finalize)]
 pub enum Error {
 	#[error("intrinsic not found: {0}")]
 	IntrinsicNotFound(IStr),
@@ -88,6 +89,7 @@
 	ImportSyntaxError {
 		path: Rc<PathBuf>,
 		source_code: IStr,
+		#[unsafe_ignore_trace]
 		error: Box<jrsonnet_parser::ParseError>,
 	},
 
@@ -95,6 +97,8 @@
 	RuntimeError(IStr),
 	#[error("stack overflow, try to reduce recursion, or set --max-stack to bigger value")]
 	StackOverflow,
+	#[error("infinite recursion detected")]
+	RecursiveLazyValueEvaluation,
 	#[error("tried to index by fractional value")]
 	FractionalIndex,
 	#[error("attempted to divide by zero")]
@@ -142,15 +146,15 @@
 	}
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Trace, Finalize)]
 pub struct StackTraceElement {
 	pub location: Option<ExprLocation>,
 	pub desc: String,
 }
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Trace, Finalize)]
 pub struct StackTrace(pub Vec<StackTraceElement>);
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Trace, Finalize)]
 pub struct LocError(Box<(Error, StackTrace)>);
 impl LocError {
 	pub fn new(e: Error) -> Self {
modifiedcrates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -1,8 +1,9 @@
 use crate::{
-	equals, error::Error::*, lazy_val, push, throw, with_state, ArrValue, Context, ContextCreator,
-	FuncDesc, FuncVal, FutureWrapper, LazyBinding, LazyVal, ObjMember, ObjValue, Result, Val,
+	equals, error::Error::*, push, throw, with_state, ArrValue, Bindable, Context, ContextCreator,
+	FuncDesc, FuncVal, FutureWrapper, LazyBinding, LazyVal, LazyValValue, ObjMember, ObjValue,
+	ObjectAssertion, Result, Val,
 };
-use closure::closure;
+use gc::{custom_trace, Finalize, Gc, Trace};
 use jrsonnet_interner::IStr;
 use jrsonnet_parser::{
 	ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, ExprLocation, FieldMember,
@@ -20,17 +21,62 @@
 	let b = b.clone();
 	if let Some(params) = &b.params {
 		let params = params.clone();
-		LazyVal::new(Box::new(move || {
-			Ok(evaluate_method(
-				context_creator.unwrap(),
-				b.name.clone(),
-				params.clone(),
-				b.value.clone(),
-			))
+
+		struct LazyMethodBinding {
+			context_creator: FutureWrapper<Context>,
+			name: IStr,
+			params: ParamsDesc,
+			value: LocExpr,
+		}
+		impl Finalize for LazyMethodBinding {}
+		unsafe impl Trace for LazyMethodBinding {
+			custom_trace!(this, {
+				mark(&this.context_creator);
+				mark(&this.name);
+				mark(&this.params);
+				mark(&this.value);
+			});
+		}
+		impl LazyValValue for LazyMethodBinding {
+			fn get(self: Box<Self>) -> Result<Val> {
+				Ok(evaluate_method(
+					self.context_creator.unwrap(),
+					self.name,
+					self.params,
+					self.value,
+				))
+			}
+		}
+
+		LazyVal::new(Box::new(LazyMethodBinding {
+			context_creator,
+			name: b.name.clone(),
+			params,
+			value: b.value.clone(),
 		}))
 	} else {
-		LazyVal::new(Box::new(move || {
-			evaluate_named(context_creator.unwrap(), &b.value, b.name.clone())
+		struct LazyNamedBinding {
+			context_creator: FutureWrapper<Context>,
+			name: IStr,
+			value: LocExpr,
+		}
+		impl Finalize for LazyNamedBinding {}
+		unsafe impl Trace for LazyNamedBinding {
+			custom_trace!(this, {
+				mark(&this.context_creator);
+				mark(&this.name);
+				mark(&this.value);
+			});
+		}
+		impl LazyValValue for LazyNamedBinding {
+			fn get(self: Box<Self>) -> Result<Val> {
+				evaluate_named(self.context_creator.unwrap(), &self.value, self.name)
+			}
+		}
+		LazyVal::new(Box::new(LazyNamedBinding {
+			context_creator,
+			name: b.name.clone(),
+			value: b.value,
 		}))
 	}
 }
@@ -39,37 +85,129 @@
 	let b = b.clone();
 	if let Some(params) = &b.params {
 		let params = params.clone();
+
+		struct BindableMethodLazyVal {
+			this: Option<ObjValue>,
+			super_obj: Option<ObjValue>,
+
+			context_creator: ContextCreator,
+			name: IStr,
+			params: ParamsDesc,
+			value: LocExpr,
+		}
+		impl Finalize for BindableMethodLazyVal {}
+		unsafe impl Trace for BindableMethodLazyVal {
+			custom_trace!(this, {
+				mark(&this.this);
+				mark(&this.super_obj);
+				mark(&this.context_creator);
+				mark(&this.name);
+				mark(&this.params);
+				mark(&this.value);
+			});
+		}
+		impl LazyValValue for BindableMethodLazyVal {
+			fn get(self: Box<Self>) -> Result<Val> {
+				Ok(evaluate_method(
+					self.context_creator.create(self.this, self.super_obj)?,
+					self.name,
+					self.params,
+					self.value,
+				))
+			}
+		}
+
+		#[derive(Trace, Finalize)]
+		struct BindableMethod {
+			context_creator: ContextCreator,
+			name: IStr,
+			params: ParamsDesc,
+			value: LocExpr,
+		}
+		impl Bindable for BindableMethod {
+			fn bind(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {
+				Ok(LazyVal::new(Box::new(BindableMethodLazyVal {
+					this: this.clone(),
+					super_obj: super_obj.clone(),
+
+					context_creator: self.context_creator.clone(),
+					name: self.name.clone(),
+					params: self.params.clone(),
+					value: self.value.clone(),
+				})))
+			}
+		}
+
 		(
 			b.name.clone(),
-			LazyBinding::Bindable(Rc::new(move |this, super_obj| {
-				Ok(lazy_val!(
-					closure!(clone b, clone params, clone context_creator, || Ok(evaluate_method(
-						context_creator.create(this.clone(), super_obj.clone())?,
-						b.name.clone(),
-						params.clone(),
-						b.value.clone(),
-					)))
-				))
-			})),
+			LazyBinding::Bindable(Gc::new(Box::new(BindableMethod {
+				context_creator,
+				name: b.name.clone(),
+				params,
+				value: b.value.clone(),
+			}))),
 		)
 	} else {
+		struct BindableNamedLazyVal {
+			this: Option<ObjValue>,
+			super_obj: Option<ObjValue>,
+
+			context_creator: ContextCreator,
+			name: IStr,
+			value: LocExpr,
+		}
+		impl Finalize for BindableNamedLazyVal {}
+		unsafe impl Trace for BindableNamedLazyVal {
+			custom_trace!(this, {
+				mark(&this.this);
+				mark(&this.super_obj);
+				mark(&this.context_creator);
+				mark(&this.name);
+				mark(&this.value);
+			});
+		}
+		impl LazyValValue for BindableNamedLazyVal {
+			fn get(self: Box<Self>) -> Result<Val> {
+				evaluate_named(
+					self.context_creator.create(self.this, self.super_obj)?,
+					&self.value,
+					self.name,
+				)
+			}
+		}
+
+		#[derive(Trace, Finalize)]
+		struct BindableNamed {
+			context_creator: ContextCreator,
+			name: IStr,
+			value: LocExpr,
+		}
+		impl Bindable for BindableNamed {
+			fn bind(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {
+				Ok(LazyVal::new(Box::new(BindableNamedLazyVal {
+					this,
+					super_obj,
+
+					context_creator: self.context_creator.clone(),
+					name: self.name.clone(),
+					value: self.value.clone(),
+				})))
+			}
+		}
+
 		(
 			b.name.clone(),
-			LazyBinding::Bindable(Rc::new(move |this, super_obj| {
-				Ok(lazy_val!(closure!(clone context_creator, clone b, ||
-					evaluate_named(
-						context_creator.create(this.clone(), super_obj.clone())?,
-						&b.value,
-						b.name.clone()
-					)
-				)))
-			})),
+			LazyBinding::Bindable(Gc::new(Box::new(BindableNamed {
+				context_creator,
+				name: b.name.clone(),
+				value: b.value.clone(),
+			}))),
 		)
 	}
 }
 
 pub fn evaluate_method(ctx: Context, name: IStr, params: ParamsDesc, body: LocExpr) -> Val {
-	Val::Func(Rc::new(FuncVal::Normal(FuncDesc {
+	Val::Func(Gc::new(FuncVal::Normal(FuncDesc {
 		name,
 		ctx,
 		params,
@@ -105,6 +243,9 @@
 
 pub fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {
 	Ok(match (a, b) {
+		(Val::DebugGcTraceValue(v1), Val::DebugGcTraceValue(v2)) => {
+			evaluate_add_op(&v1.value, &v2.value)?
+		}
 		(Val::Str(v1), Val::Str(v2)) => Val::Str(((**v1).to_owned() + v2).into()),
 
 		// Can't use generic json serialization way, because it depends on number to string concatenation (std.jsonnet:890)
@@ -257,7 +398,7 @@
 	}
 
 	let mut new_members = FxHashMap::default();
-	let mut assertions = Vec::new();
+	let mut assertions: Vec<Box<dyn ObjectAssertion>> = Vec::new();
 	for member in members.iter() {
 		match member {
 			Member::Field(FieldMember {
@@ -272,20 +413,36 @@
 					continue;
 				}
 				let name = name.unwrap();
+
+				#[derive(Trace, Finalize)]
+				struct ObjMemberBinding {
+					context_creator: ContextCreator,
+					value: LocExpr,
+					name: IStr,
+				}
+				impl Bindable for ObjMemberBinding {
+					fn bind(
+						&self,
+						this: Option<ObjValue>,
+						super_obj: Option<ObjValue>,
+					) -> Result<LazyVal> {
+						Ok(LazyVal::new_resolved(evaluate_named(
+							self.context_creator.create(this, super_obj)?,
+							&self.value,
+							self.name.clone(),
+						)?))
+					}
+				}
 				new_members.insert(
 					name.clone(),
 					ObjMember {
 						add: *plus,
 						visibility: *visibility,
-						invoke: LazyBinding::Bindable(Rc::new(
-							closure!(clone name, clone value, clone context_creator, |this, super_obj| {
-								Ok(LazyVal::new_resolved(evaluate_named(
-									context_creator.create(this, super_obj)?,
-									&value,
-									name.clone(),
-								)?))
-							}),
-						)),
+						invoke: LazyBinding::Bindable(Gc::new(Box::new(ObjMemberBinding {
+							context_creator: context_creator.clone(),
+							value: value.clone(),
+							name,
+						}))),
 						location: value.1.clone(),
 					},
 				);
@@ -301,33 +458,73 @@
 					continue;
 				}
 				let name = name.unwrap();
+				#[derive(Trace, Finalize)]
+				struct ObjMemberBinding {
+					context_creator: ContextCreator,
+					value: LocExpr,
+					params: ParamsDesc,
+					name: IStr,
+				}
+				impl Bindable for ObjMemberBinding {
+					fn bind(
+						&self,
+						this: Option<ObjValue>,
+						super_obj: Option<ObjValue>,
+					) -> Result<LazyVal> {
+						Ok(LazyVal::new_resolved(evaluate_method(
+							self.context_creator.create(this, super_obj)?,
+							self.name.clone(),
+							self.params.clone(),
+							self.value.clone(),
+						)))
+					}
+				}
 				new_members.insert(
 					name.clone(),
 					ObjMember {
 						add: false,
 						visibility: Visibility::Hidden,
-						invoke: LazyBinding::Bindable(Rc::new(
-							closure!(clone value, clone context_creator, clone params, clone name, |this, super_obj| {
-								// TODO: Assert
-								Ok(LazyVal::new_resolved(evaluate_method(
-									context_creator.create(this, super_obj)?,
-									name.clone(),
-									params.clone(),
-									value.clone(),
-								)))
-							}),
-						)),
+						invoke: LazyBinding::Bindable(Gc::new(Box::new(ObjMemberBinding {
+							context_creator: context_creator.clone(),
+							value: value.clone(),
+							params: params.clone(),
+							name,
+						}))),
 						location: value.1.clone(),
 					},
 				);
 			}
 			Member::BindStmt(_) => {}
 			Member::AssertStmt(stmt) => {
-				assertions.push(stmt.clone());
+				struct ObjectAssert {
+					context_creator: ContextCreator,
+					assert: AssertStmt,
+				}
+				impl Finalize for ObjectAssert {}
+				unsafe impl Trace for ObjectAssert {
+					custom_trace!(this, {
+						mark(&this.context_creator);
+						mark(&this.assert);
+					});
+				}
+				impl ObjectAssertion for ObjectAssert {
+					fn run(
+						&self,
+						this: Option<ObjValue>,
+						super_obj: Option<ObjValue>,
+					) -> Result<()> {
+						let ctx = self.context_creator.create(this, super_obj)?;
+						evaluate_assert(ctx, &self.assert)
+					}
+				}
+				assertions.push(Box::new(ObjectAssert {
+					context_creator: context_creator.clone(),
+					assert: stmt.clone(),
+				}));
 			}
 		}
 	}
-	let this = ObjValue::new(context, None, Rc::new(new_members), Rc::new(assertions));
+	let this = ObjValue::new(None, Gc::new(new_members), Gc::new(assertions));
 	future_this.fill(this.clone());
 	Ok(this)
 }
@@ -361,16 +558,37 @@
 				match key {
 					Val::Null => {}
 					Val::Str(n) => {
+						#[derive(Trace, Finalize)]
+						struct ObjCompBinding {
+							context: Context,
+							value: LocExpr,
+						}
+						impl Bindable for ObjCompBinding {
+							fn bind(
+								&self,
+								this: Option<ObjValue>,
+								_super_obj: Option<ObjValue>,
+							) -> Result<LazyVal> {
+								Ok(LazyVal::new_resolved(evaluate(
+									self.context.clone().extend(
+										FxHashMap::default(),
+										None,
+										this,
+										None,
+									),
+									&self.value,
+								)?))
+							}
+						}
 						new_members.insert(
 							n,
 							ObjMember {
 								add: false,
 								visibility: Visibility::Normal,
-								invoke: LazyBinding::Bindable(Rc::new(
-									closure!(clone ctx, clone obj.value, |this, _super_obj| {
-										Ok(LazyVal::new_resolved(evaluate(ctx.clone().extend(FxHashMap::default(), None, this, None), &value)?))
-									}),
-								)),
+								invoke: LazyBinding::Bindable(Gc::new(Box::new(ObjCompBinding {
+									context: ctx.clone(),
+									value: obj.value.clone(),
+								}))),
 								location: obj.value.1.clone(),
 							},
 						);
@@ -381,7 +599,7 @@
 				Ok(())
 			})?;
 
-			let this = ObjValue::new(context, None, Rc::new(new_members), Rc::new(Vec::new()));
+			let this = ObjValue::new(None, Gc::new(new_members), Gc::new(Vec::new()));
 			future_this.fill(this.clone());
 			this
 		}
@@ -486,7 +704,7 @@
 							if let Some(v) = v.get(s.clone())? {
 								Ok(v)
 							} else if v.get("__intrinsic_namespace__".into())?.is_some() {
-								Ok(Val::Func(Rc::new(FuncVal::Intrinsic(s))))
+								Ok(Val::Func(Gc::new(FuncVal::Intrinsic(s))))
 							} else {
 								throw!(NoSuchField(s))
 							}
@@ -549,11 +767,27 @@
 		Arr(items) => {
 			let mut out = Vec::with_capacity(items.len());
 			for item in items {
-				out.push(LazyVal::new(Box::new(
-					closure!(clone context, clone item, || {
-						evaluate(context.clone(), &item)
-					}),
-				)));
+				// TODO: Implement ArrValue::Lazy with same context for every element?
+				struct ArrayElement {
+					context: Context,
+					item: LocExpr,
+				}
+				impl Finalize for ArrayElement {}
+				unsafe impl Trace for ArrayElement {
+					custom_trace!(this, {
+						mark(&this.context);
+						mark(&this.item);
+					});
+				}
+				impl LazyValValue for ArrayElement {
+					fn get(self: Box<Self>) -> Result<Val> {
+						evaluate(self.context, &self.item)
+					}
+				}
+				out.push(LazyVal::new(Box::new(ArrayElement {
+					context: context.clone(),
+					item: item.clone(),
+				})));
 			}
 			Val::Arr(out.into())
 		}
@@ -563,7 +797,7 @@
 				out.push(evaluate(ctx, expr)?);
 				Ok(())
 			})?;
-			Val::Arr(ArrValue::Eager(Rc::new(out)))
+			Val::Arr(ArrValue::Eager(Gc::new(out)))
 		}
 		Obj(body) => Val::Obj(evaluate_object(context, body)?),
 		ObjExtend(s, t) => evaluate_add_op(
@@ -576,7 +810,7 @@
 		Function(params, body) => {
 			evaluate_method(context, "anonymous".into(), params.clone(), body.clone())
 		}
-		Intrinsic(name) => Val::Func(Rc::new(FuncVal::Intrinsic(name.clone()))),
+		Intrinsic(name) => Val::Func(Gc::new(FuncVal::Intrinsic(name.clone()))),
 		AssertExpr(assert, returned) => {
 			evaluate_assert(context.clone(), assert)?;
 			evaluate(context, returned)?
modifiedcrates/jrsonnet-evaluator/src/function.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function.rs
+++ b/crates/jrsonnet-evaluator/src/function.rs
@@ -1,7 +1,7 @@
-use crate::{error::Error::*, evaluate, lazy_val, resolved_lazy_val, throw, Context, Result, Val};
-use closure::closure;
+use crate::{error::Error::*, evaluate, throw, Context, LazyVal, LazyValValue, Result, Val};
+use gc::{custom_trace, Finalize, Trace};
 use jrsonnet_interner::IStr;
-use jrsonnet_parser::{ArgsDesc, ParamsDesc};
+use jrsonnet_parser::{ArgsDesc, LocExpr, ParamsDesc};
 use rustc_hash::FxHashMap;
 use std::{collections::HashMap, hash::BuildHasherDefault};
 
@@ -53,9 +53,29 @@
 			throw!(FunctionParameterNotBoundInCall(p.0.clone()));
 		};
 		let val = if tailstrict {
-			resolved_lazy_val!(evaluate(ctx, expr)?)
+			LazyVal::new_resolved(evaluate(ctx, expr)?)
 		} else {
-			lazy_val!(closure!(clone ctx, clone expr, ||evaluate(ctx.clone(), &expr)))
+			struct EvaluateLazyVal {
+				context: Context,
+				expr: LocExpr,
+			}
+			impl Finalize for EvaluateLazyVal {}
+			unsafe impl Trace for EvaluateLazyVal {
+				custom_trace!(this, {
+					mark(&this.context);
+					mark(&this.expr);
+				});
+			}
+			impl LazyValValue for EvaluateLazyVal {
+				fn get(self: Box<Self>) -> Result<Val> {
+					evaluate(self.context, &self.expr)
+				}
+			}
+
+			LazyVal::new(Box::new(EvaluateLazyVal {
+				context: ctx.clone(),
+				expr: expr.clone(),
+			}))
 		};
 		out.insert(p.0.clone(), val);
 	}
@@ -89,19 +109,30 @@
 	// Fill defaults
 	for (id, p) in params.iter().enumerate() {
 		let val = if let Some(arg) = positioned_args[id].take() {
-			resolved_lazy_val!(arg)
+			LazyVal::new_resolved(arg)
 		} else if let Some(default) = &p.1 {
 			if tailstrict {
-				resolved_lazy_val!(evaluate(
+				LazyVal::new_resolved(evaluate(
 					body_ctx.clone().expect(NO_DEFAULT_CONTEXT),
-					default
+					default,
 				)?)
 			} else {
 				let body_ctx = body_ctx.clone();
 				let default = default.clone();
-				lazy_val!(move || {
-					evaluate(body_ctx.clone().expect(NO_DEFAULT_CONTEXT), &default)
-				})
+				#[derive(Trace, Finalize)]
+				struct EvaluateLazyVal {
+					body_ctx: Option<Context>,
+					default: LocExpr,
+				}
+				impl LazyValValue for EvaluateLazyVal {
+					fn get(self: Box<Self>) -> Result<Val> {
+						evaluate(
+							self.body_ctx.clone().expect(NO_DEFAULT_CONTEXT),
+							&self.default,
+						)
+					}
+				}
+				LazyVal::new(Box::new(EvaluateLazyVal { body_ctx, default }))
 			}
 		} else {
 			throw!(FunctionParameterNotBoundInCall(p.0.clone()));
@@ -135,7 +166,7 @@
 		} else {
 			throw!(FunctionParameterNotBoundInCall(p.0.clone()));
 		};
-		out.insert(p.0.clone(), resolved_lazy_val!(val));
+		out.insert(p.0.clone(), LazyVal::new_resolved(val));
 	}
 
 	Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None))
modifiedcrates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -2,6 +2,7 @@
 	error::{Error::*, LocError, Result},
 	throw, Context, LazyBinding, LazyVal, ObjMember, ObjValue, Val,
 };
+use gc::Gc;
 use jrsonnet_parser::Visibility;
 use rustc_hash::FxHasher;
 use serde_json::{Map, Number, Value};
@@ -9,7 +10,6 @@
 	collections::HashMap,
 	convert::{TryFrom, TryInto},
 	hash::BuildHasherDefault,
-	rc::Rc,
 };
 
 impl TryFrom<&Val> for Value {
@@ -42,6 +42,7 @@
 				Self::Object(out)
 			}
 			Val::Func(_) => throw!(RuntimeError("tried to manifest function".into())),
+			Val::DebugGcTraceValue(v) => Value::try_from(&*v.value as &Val)?,
 		})
 	}
 }
@@ -76,12 +77,7 @@
 						},
 					);
 				}
-				Self::Obj(ObjValue::new(
-					Context::new(),
-					None,
-					Rc::new(entries),
-					Rc::new(Vec::new()),
-				))
+				Self::Obj(ObjValue::new(None, Gc::new(entries), Gc::new(Vec::new())))
 			}
 		}
 	}
modifiedcrates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -25,6 +25,7 @@
 use error::{Error::*, LocError, Result, StackTraceElement};
 pub use evaluate::*;
 pub use function::parse_function_call;
+use gc::{Finalize, Gc, Trace};
 pub use import::*;
 use jrsonnet_interner::IStr;
 use jrsonnet_parser::*;
@@ -42,10 +43,12 @@
 use trace::{offset_to_location, CodeLocation, CompactFormat, TraceFormat};
 pub use val::*;
 
-type BindableFn = dyn Fn(Option<ObjValue>, Option<ObjValue>) -> Result<LazyVal>;
-#[derive(Clone)]
+pub trait Bindable: Trace {
+	fn bind(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal>;
+}
+#[derive(Trace, Finalize, Clone)]
 pub enum LazyBinding {
-	Bindable(Rc<BindableFn>),
+	Bindable(Gc<Box<dyn Bindable>>),
 	Bound(LazyVal),
 }
 
@@ -57,7 +60,7 @@
 impl LazyBinding {
 	pub fn evaluate(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {
 		match self {
-			Self::Bindable(v) => v(this, super_obj),
+			Self::Bindable(v) => v.bind(this, super_obj),
 			Self::Bound(v) => Ok(v.clone()),
 		}
 	}
@@ -71,7 +74,7 @@
 	/// Used for s`td.extVar`
 	pub ext_vars: HashMap<IStr, Val>,
 	/// Used for ext.native
-	pub ext_natives: HashMap<IStr, Rc<NativeCallback>>,
+	pub ext_natives: HashMap<IStr, Gc<NativeCallback>>,
 	/// TLA vars
 	pub tla_vars: HashMap<IStr, Val>,
 	/// Global variables are inserted in default context
@@ -270,7 +273,7 @@
 		let mut new_bindings: FxHashMap<IStr, LazyVal> =
 			FxHashMap::with_capacity_and_hasher(globals.len(), BuildHasherDefault::default());
 		for (name, value) in globals.iter() {
-			new_bindings.insert(name.clone(), resolved_lazy_val!(value.clone()));
+			new_bindings.insert(name.clone(), LazyVal::new_resolved(value.clone()));
 		}
 		Context::new().extend_bound(new_bindings)
 	}
@@ -449,7 +452,7 @@
 		self.settings_mut().import_resolver = resolver;
 	}
 
-	pub fn add_native(&self, name: IStr, cb: Rc<NativeCallback>) {
+	pub fn add_native(&self, name: IStr, cb: Gc<NativeCallback>) {
 		self.settings_mut().ext_natives.insert(name, cb);
 	}
 
modifiedcrates/jrsonnet-evaluator/src/map.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/map.rs
+++ b/crates/jrsonnet-evaluator/src/map.rs
@@ -1,28 +1,29 @@
+use gc::{Finalize, Gc, Trace};
 use jrsonnet_interner::IStr;
 use rustc_hash::FxHashMap;
-use std::rc::Rc;
 
-#[derive(Default, Debug)]
-struct LayeredHashMapInternals<V> {
+pub struct LayeredHashMapInternals<V: Trace + Finalize + 'static> {
 	parent: Option<LayeredHashMap<V>>,
 	current: FxHashMap<IStr, V>,
 }
 
-#[derive(Debug)]
-pub struct LayeredHashMap<V>(Rc<LayeredHashMapInternals<V>>);
+unsafe impl<V: Trace + Finalize + 'static> Trace for LayeredHashMapInternals<V> {
+	gc::custom_trace!(this, {
+		mark(&this.parent);
+		mark(&this.current);
+	});
+}
+impl<V: Trace + Finalize + 'static> Finalize for LayeredHashMapInternals<V> {}
+
+#[derive(Trace, Finalize)]
+pub struct LayeredHashMap<V: Trace + Finalize + 'static>(Gc<LayeredHashMapInternals<V>>);
 
-impl<V> LayeredHashMap<V> {
+impl<V: Trace + 'static> LayeredHashMap<V> {
 	pub fn extend(self, new_layer: FxHashMap<IStr, V>) -> Self {
-		match Rc::try_unwrap(self.0) {
-			Ok(mut map) => {
-				map.current.extend(new_layer);
-				Self(Rc::new(map))
-			}
-			Err(this) => Self(Rc::new(LayeredHashMapInternals {
-				parent: Some(Self(this)),
-				current: new_layer,
-			})),
-		}
+		Self(Gc::new(LayeredHashMapInternals {
+			parent: Some(self),
+			current: new_layer,
+		}))
 	}
 
 	pub fn get(&self, key: &IStr) -> Option<&V> {
@@ -33,15 +34,15 @@
 	}
 }
 
-impl<V> Clone for LayeredHashMap<V> {
+impl<V: Trace + 'static> Clone for LayeredHashMap<V> {
 	fn clone(&self) -> Self {
 		Self(self.0.clone())
 	}
 }
 
-impl<V> Default for LayeredHashMap<V> {
+impl<V: Trace + 'static> Default for LayeredHashMap<V> {
 	fn default() -> Self {
-		Self(Rc::new(LayeredHashMapInternals {
+		Self(Gc::new(LayeredHashMapInternals {
 			parent: None,
 			current: FxHashMap::default(),
 		}))
modifiedcrates/jrsonnet-evaluator/src/native.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/native.rs
+++ b/crates/jrsonnet-evaluator/src/native.rs
@@ -1,27 +1,27 @@
 #![allow(clippy::type_complexity)]
 
 use crate::{error::Result, Val};
+use gc::{Finalize, Trace};
 use jrsonnet_parser::ParamsDesc;
 use std::fmt::Debug;
 use std::path::PathBuf;
 use std::rc::Rc;
 
+pub trait NativeCallbackHandler: Trace {
+	fn call(&self, from: Option<Rc<PathBuf>>, args: &[Val]) -> Result<Val>;
+}
+
+#[derive(Trace, Finalize)]
 pub struct NativeCallback {
 	pub params: ParamsDesc,
-	handler: Box<dyn Fn(Option<Rc<PathBuf>>, &[Val]) -> Result<Val>>,
+	handler: Box<dyn NativeCallbackHandler>,
 }
 impl NativeCallback {
-	pub fn new(
-		params: ParamsDesc,
-		handler: impl Fn(Option<Rc<PathBuf>>, &[Val]) -> Result<Val> + 'static,
-	) -> Self {
-		Self {
-			params,
-			handler: Box::new(handler),
-		}
+	pub fn new(params: ParamsDesc, handler: Box<dyn NativeCallbackHandler>) -> Self {
+		Self { params, handler }
 	}
 	pub fn call(&self, caller: Option<Rc<PathBuf>>, args: &[Val]) -> Result<Val> {
-		(self.handler)(caller, args)
+		self.handler.call(caller, args)
 	}
 }
 impl Debug for NativeCallback {
modifiedcrates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -1,11 +1,12 @@
 use crate::{evaluate_add_op, evaluate_assert, Context, LazyBinding, Result, Val};
+use gc::{Finalize, Gc, GcCell, Trace};
 use jrsonnet_interner::IStr;
 use jrsonnet_parser::{AssertStmt, ExprLocation, Visibility};
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::hash::{Hash, Hasher};
-use std::{cell::RefCell, fmt::Debug, hash::BuildHasherDefault, rc::Rc};
+use std::{fmt::Debug, hash::BuildHasherDefault};
 
-#[derive(Debug)]
+#[derive(Debug, Trace, Finalize)]
 pub struct ObjMember {
 	pub add: bool,
 	pub visibility: Visibility,
@@ -13,21 +14,24 @@
 	pub location: Option<ExprLocation>,
 }
 
+pub trait ObjectAssertion: Trace {
+	fn run(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<()>;
+}
+
 // Field => This
 type CacheKey = (IStr, ObjValue);
-#[derive(Debug)]
+#[derive(Trace, Finalize)]
 pub struct ObjValueInternals {
-	context: Context,
 	super_obj: Option<ObjValue>,
-	assertions: Rc<Vec<AssertStmt>>,
-	assertions_ran: RefCell<FxHashSet<ObjValue>>,
+	assertions: Gc<Vec<Box<dyn ObjectAssertion>>>,
+	assertions_ran: GcCell<FxHashSet<ObjValue>>,
 	this_obj: Option<ObjValue>,
-	this_entries: Rc<FxHashMap<IStr, ObjMember>>,
-	value_cache: RefCell<FxHashMap<CacheKey, Option<Val>>>,
+	this_entries: Gc<FxHashMap<IStr, ObjMember>>,
+	value_cache: GcCell<FxHashMap<CacheKey, Option<Val>>>,
 }
 
-#[derive(Clone)]
-pub struct ObjValue(pub(crate) Rc<ObjValueInternals>);
+#[derive(Clone, Trace, Finalize)]
+pub struct ObjValue(pub(crate) Gc<ObjValueInternals>);
 impl Debug for ObjValue {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		if let Some(super_obj) = self.0.super_obj.as_ref() {
@@ -55,39 +59,30 @@
 
 impl ObjValue {
 	pub fn new(
-		context: Context,
 		super_obj: Option<Self>,
-		this_entries: Rc<FxHashMap<IStr, ObjMember>>,
-		assertions: Rc<Vec<AssertStmt>>,
+		this_entries: Gc<FxHashMap<IStr, ObjMember>>,
+		assertions: Gc<Vec<Box<dyn ObjectAssertion>>>,
 	) -> Self {
-		Self(Rc::new(ObjValueInternals {
-			context,
+		Self(Gc::new(ObjValueInternals {
 			super_obj,
 			assertions,
-			assertions_ran: RefCell::new(FxHashSet::default()),
+			assertions_ran: GcCell::new(FxHashSet::default()),
 			this_obj: None,
 			this_entries,
-			value_cache: RefCell::new(FxHashMap::default()),
+			value_cache: GcCell::new(FxHashMap::default()),
 		}))
 	}
 	pub fn new_empty() -> Self {
-		Self::new(
-			Context::new(),
-			None,
-			Rc::new(FxHashMap::default()),
-			Rc::new(Vec::new()),
-		)
+		Self::new(None, Gc::new(FxHashMap::default()), Gc::new(Vec::new()))
 	}
 	pub fn extend_from(&self, super_obj: Self) -> Self {
 		match &self.0.super_obj {
 			None => Self::new(
-				self.0.context.clone(),
 				Some(super_obj),
 				self.0.this_entries.clone(),
 				self.0.assertions.clone(),
 			),
 			Some(v) => Self::new(
-				self.0.context.clone(),
 				Some(v.extend_from(super_obj)),
 				self.0.this_entries.clone(),
 				self.0.assertions.clone(),
@@ -95,14 +90,13 @@
 		}
 	}
 	pub fn with_this(&self, this_obj: Self) -> Self {
-		Self(Rc::new(ObjValueInternals {
-			context: self.0.context.clone(),
+		Self(Gc::new(ObjValueInternals {
 			super_obj: self.0.super_obj.clone(),
 			assertions: self.0.assertions.clone(),
-			assertions_ran: RefCell::new(FxHashSet::default()),
+			assertions_ran: GcCell::new(FxHashSet::default()),
 			this_obj: Some(this_obj),
 			this_entries: self.0.this_entries.clone(),
-			value_cache: RefCell::new(FxHashMap::default()),
+			value_cache: GcCell::new(FxHashMap::default()),
 		}))
 	}
 
@@ -203,12 +197,7 @@
 	pub fn extend_with_field(self, key: IStr, value: ObjMember) -> Self {
 		let mut new = FxHashMap::with_capacity_and_hasher(1, BuildHasherDefault::default());
 		new.insert(key, value);
-		Self::new(
-			Context::new(),
-			Some(self),
-			Rc::new(new),
-			Rc::new(Vec::new()),
-		)
+		Self::new(Some(self), Gc::new(new), Gc::new(Vec::new()))
 	}
 
 	fn get_raw(&self, key: IStr, real_this: Option<&Self>) -> Result<Option<Val>> {
@@ -249,13 +238,7 @@
 	fn run_assertions_raw(&self, real_this: &Self) -> Result<()> {
 		if self.0.assertions_ran.borrow_mut().insert(real_this.clone()) {
 			for assertion in self.0.assertions.iter() {
-				if let Err(e) = evaluate_assert(
-					self.0
-						.context
-						.clone()
-						.with_this_super(real_this.clone(), self.0.super_obj.clone()),
-					assertion,
-				) {
+				if let Err(e) = assertion.run(Some(real_this.clone()), self.0.super_obj.clone()) {
 					self.0.assertions_ran.borrow_mut().remove(real_this);
 					return Err(e);
 				}
@@ -271,19 +254,19 @@
 	}
 
 	pub fn ptr_eq(a: &Self, b: &Self) -> bool {
-		Rc::ptr_eq(&a.0, &b.0)
+		Gc::ptr_eq(&a.0, &b.0)
 	}
 }
 
 impl PartialEq for ObjValue {
 	fn eq(&self, other: &Self) -> bool {
-		Rc::ptr_eq(&self.0, &other.0)
+		Gc::ptr_eq(&self.0, &other.0)
 	}
 }
 
 impl Eq for ObjValue {}
 impl Hash for ObjValue {
-	fn hash<H: Hasher>(&self, state: &mut H) {
-		state.write_usize(Rc::as_ptr(&self.0) as usize)
+	fn hash<H: Hasher>(&self, hasher: &mut H) {
+		hasher.write_usize(&*self.0 as *const _ as usize)
 	}
 }
modifiedcrates/jrsonnet-evaluator/src/typed.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/typed.rs
+++ b/crates/jrsonnet-evaluator/src/typed.rs
@@ -4,6 +4,7 @@
 	error::{Error, LocError, Result},
 	push, Val,
 };
+use gc::{Finalize, Trace};
 use jrsonnet_parser::ExprLocation;
 use jrsonnet_types::{ComplexValType, ValType};
 use thiserror::Error;
@@ -20,7 +21,7 @@
 	}};
 }
 
-#[derive(Debug, Error, Clone)]
+#[derive(Debug, Error, Clone, Trace, Finalize)]
 pub enum TypeError {
 	#[error("expected {0}, got {1}")]
 	ExpectedGot(ComplexValType, ValType),
@@ -37,7 +38,7 @@
 	}
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Trace, Finalize)]
 pub struct TypeLocError(Box<TypeError>, ValuePathStack);
 impl From<TypeError> for TypeLocError {
 	fn from(e: TypeError) -> Self {
@@ -59,7 +60,7 @@
 	}
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Trace, Finalize)]
 pub struct TypeLocErrorList(Vec<TypeLocError>);
 impl Display for TypeLocErrorList {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -122,7 +123,7 @@
 	}
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Trace, Finalize)]
 enum ValuePathItem {
 	Field(Rc<str>),
 	Index(u64),
@@ -137,7 +138,7 @@
 	}
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Trace, Finalize)]
 struct ValuePathStack(Vec<ValuePathItem>);
 impl Display for ValuePathStack {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -3,52 +3,75 @@
 		call_builtin,
 		manifest::{manifest_json_ex, ManifestJsonOptions, ManifestType},
 	},
-	error::Error::*,
+	error::{Error::*, LocError},
 	evaluate,
 	function::{parse_function_call, parse_function_call_map, place_args},
 	native::NativeCallback,
 	throw, with_state, Context, ObjValue, Result,
 };
+use gc::{custom_trace, Finalize, Gc, GcCell, Trace};
 use jrsonnet_interner::IStr;
 use jrsonnet_parser::{el, Arg, ArgsDesc, Expr, ExprLocation, LiteralType, LocExpr, ParamsDesc};
 use jrsonnet_types::ValType;
-use std::{cell::RefCell, collections::HashMap, fmt::Debug, rc::Rc};
+use std::{collections::HashMap, fmt::Debug, rc::Rc};
 
+pub trait LazyValValue: Trace {
+	fn get(self: Box<Self>) -> Result<Val>;
+}
+
 enum LazyValInternals {
 	Computed(Val),
-	Waiting(Box<dyn Fn() -> Result<Val>>),
+	Errored(LocError),
+	Waiting(Box<dyn LazyValValue>),
+	Pending,
 }
-#[derive(Clone)]
-pub struct LazyVal(Rc<RefCell<LazyValInternals>>);
+impl Finalize for LazyValInternals {}
+unsafe impl Trace for LazyValInternals {
+	custom_trace!(this, {
+		match &this {
+			LazyValInternals::Computed(v) => mark(v),
+			LazyValInternals::Errored(e) => mark(e),
+			LazyValInternals::Waiting(w) => mark(w),
+			LazyValInternals::Pending => {}
+		}
+	});
+}
+
+#[derive(Clone, Trace, Finalize)]
+pub struct LazyVal(Gc<GcCell<LazyValInternals>>);
 impl LazyVal {
-	pub fn new(f: Box<dyn Fn() -> Result<Val>>) -> Self {
-		Self(Rc::new(RefCell::new(LazyValInternals::Waiting(f))))
+	pub fn new(f: Box<dyn LazyValValue>) -> Self {
+		Self(Gc::new(GcCell::new(LazyValInternals::Waiting(f))))
 	}
 	pub fn new_resolved(val: Val) -> Self {
-		Self(Rc::new(RefCell::new(LazyValInternals::Computed(val))))
+		Self(Gc::new(GcCell::new(LazyValInternals::Computed(val))))
 	}
 	pub fn evaluate(&self) -> Result<Val> {
-		let new_value = match &*self.0.borrow() {
+		match &*self.0.borrow() {
 			LazyValInternals::Computed(v) => return Ok(v.clone()),
-			LazyValInternals::Waiting(f) => f()?,
+			LazyValInternals::Errored(e) => return Err(e.clone().into()),
+			LazyValInternals::Pending => return Err(RecursiveLazyValueEvaluation.into()),
+			_ => (),
+		};
+		let value = if let LazyValInternals::Waiting(value) =
+			std::mem::replace(&mut *self.0.borrow_mut(), LazyValInternals::Pending)
+		{
+			value
+		} else {
+			unreachable!()
 		};
+		let new_value = match value.get() {
+			Ok(v) => v,
+			Err(e) => {
+				*self.0.borrow_mut() = LazyValInternals::Errored(e.clone());
+				return Err(e);
+			}
+		};
 		*self.0.borrow_mut() = LazyValInternals::Computed(new_value.clone());
 		Ok(new_value)
 	}
 }
 
-#[macro_export]
-macro_rules! lazy_val {
-	($f: expr) => {
-		$crate::LazyVal::new(Box::new($f))
-	};
-}
-#[macro_export]
-macro_rules! resolved_lazy_val {
-	($f: expr) => {
-		$crate::LazyVal::new_resolved($f)
-	};
-}
 impl Debug for LazyVal {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		write!(f, "Lazy")
@@ -56,11 +79,11 @@
 }
 impl PartialEq for LazyVal {
 	fn eq(&self, other: &Self) -> bool {
-		Rc::ptr_eq(&self.0, &other.0)
+		Gc::ptr_eq(&self.0, &other.0)
 	}
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Trace, Finalize)]
 pub struct FuncDesc {
 	pub name: IStr,
 	pub ctx: Context,
@@ -68,14 +91,14 @@
 	pub body: LocExpr,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Trace, Finalize)]
 pub enum FuncVal {
 	/// Plain function implemented in jsonnet
 	Normal(FuncDesc),
 	/// Standard library function
 	Intrinsic(IStr),
 	/// Library functions implemented in native
-	NativeExt(IStr, Rc<NativeCallback>),
+	NativeExt(IStr, Gc<NativeCallback>),
 }
 
 impl PartialEq for FuncVal {
@@ -174,13 +197,23 @@
 
 #[derive(Debug, Clone)]
 pub enum ArrValue {
-	Lazy(Rc<Vec<LazyVal>>),
-	Eager(Rc<Vec<Val>>),
+	Lazy(Gc<Vec<LazyVal>>),
+	Eager(Gc<Vec<Val>>),
 	Extended(Box<(Self, Self)>),
 }
+impl Finalize for ArrValue {}
+unsafe impl Trace for ArrValue {
+	custom_trace!(this, {
+		match &this {
+			ArrValue::Lazy(l) => mark(l),
+			ArrValue::Eager(e) => mark(e),
+			ArrValue::Extended(x) => mark(x),
+		}
+	});
+}
 impl ArrValue {
 	pub fn new_eager() -> Self {
-		Self::Eager(Rc::new(Vec::new()))
+		Self::Eager(Gc::new(Vec::new()))
 	}
 
 	pub fn len(&self) -> usize {
@@ -231,14 +264,14 @@
 		}
 	}
 
-	pub fn evaluated(&self) -> Result<Rc<Vec<Val>>> {
+	pub fn evaluated(&self) -> Result<Gc<Vec<Val>>> {
 		Ok(match self {
 			Self::Lazy(vec) => {
 				let mut out = Vec::with_capacity(vec.len());
 				for item in vec.iter() {
 					out.push(item.evaluate()?);
 				}
-				Rc::new(out)
+				Gc::new(out)
 			}
 			Self::Eager(vec) => vec.clone(),
 			Self::Extended(_v) => {
@@ -246,7 +279,7 @@
 				for item in self.iter() {
 					out.push(item?);
 				}
-				Rc::new(out)
+				Gc::new(out)
 			}
 		})
 	}
@@ -272,12 +305,12 @@
 			Self::Lazy(vec) => {
 				let mut out = (&vec as &Vec<_>).clone();
 				out.reverse();
-				Self::Lazy(Rc::new(out))
+				Self::Lazy(Gc::new(out))
 			}
 			Self::Eager(vec) => {
 				let mut out = (&vec as &Vec<_>).clone();
 				out.reverse();
-				Self::Eager(Rc::new(out))
+				Self::Eager(Gc::new(out))
 			}
 			Self::Extended(b) => Self::Extended(Box::new((b.1.reversed(), b.0.reversed()))),
 		}
@@ -290,7 +323,7 @@
 			out.push(mapper(value?)?);
 		}
 
-		Ok(Self::Eager(Rc::new(out)))
+		Ok(Self::Eager(Gc::new(out)))
 	}
 
 	pub fn filter(self, filter: impl Fn(&Val) -> Result<bool>) -> Result<Self> {
@@ -303,13 +336,13 @@
 			}
 		}
 
-		Ok(Self::Eager(Rc::new(out)))
+		Ok(Self::Eager(Gc::new(out)))
 	}
 
 	pub fn ptr_eq(a: &Self, b: &Self) -> bool {
 		match (a, b) {
-			(Self::Lazy(a), Self::Lazy(b)) => Rc::ptr_eq(a, b),
-			(Self::Eager(a), Self::Eager(b)) => Rc::ptr_eq(a, b),
+			(Self::Lazy(a), Self::Lazy(b)) => Gc::ptr_eq(a, b),
+			(Self::Eager(a), Self::Eager(b)) => Gc::ptr_eq(a, b),
 			_ => false,
 		}
 	}
@@ -317,13 +350,72 @@
 
 impl From<Vec<LazyVal>> for ArrValue {
 	fn from(v: Vec<LazyVal>) -> Self {
-		Self::Lazy(Rc::new(v))
+		Self::Lazy(Gc::new(v))
 	}
 }
 
 impl From<Vec<Val>> for ArrValue {
 	fn from(v: Vec<Val>) -> Self {
-		Self::Eager(Rc::new(v))
+		Self::Eager(Gc::new(v))
+	}
+}
+
+#[derive(Debug)]
+pub struct DebugGcTraceValue {
+	name: IStr,
+	pub value: Box<Val>,
+}
+impl DebugGcTraceValue {
+	fn print(&self, action: &str) {
+		println!("{} {}#{:?}", action, self.name, &*self.value as *const _)
+	}
+}
+impl Finalize for DebugGcTraceValue {
+	fn finalize(&self) {
+		self.print("Garbage-collecting")
+	}
+}
+impl Drop for DebugGcTraceValue {
+	fn drop(&mut self) {
+		self.print("Garbage-collected")
+	}
+}
+unsafe impl Trace for DebugGcTraceValue {
+	unsafe fn trace(&self) {
+		self.print("Traced");
+		self.value.trace()
+	}
+	unsafe fn root(&self) {
+		self.print("Rooted");
+		self.value.root()
+	}
+	unsafe fn unroot(&self) {
+		self.print("Unrooted");
+		self.value.unroot()
+	}
+	fn finalize_glue(&self) {
+		Finalize::finalize(self)
+	}
+}
+impl Clone for DebugGcTraceValue {
+	fn clone(&self) -> Self {
+		self.print("Cloned");
+		let value = DebugGcTraceValue {
+			name: self.name.clone(),
+			value: self.value.clone(),
+		};
+		value.print("I'm clone");
+		value
+	}
+}
+impl DebugGcTraceValue {
+	pub fn new(name: IStr, value: Val) -> Val {
+		let value = Self {
+			name,
+			value: Box::new(value),
+		};
+		value.print("Constructed");
+		Val::DebugGcTraceValue(value)
 	}
 }
 
@@ -335,7 +427,23 @@
 	Num(f64),
 	Arr(ArrValue),
 	Obj(ObjValue),
-	Func(Rc<FuncVal>),
+	Func(Gc<FuncVal>),
+	DebugGcTraceValue(DebugGcTraceValue),
+}
+impl Finalize for Val {}
+unsafe impl Trace for Val {
+	custom_trace!(this, {
+		match &this {
+			Val::Bool(_) => {}
+			Val::Null => {}
+			Val::Str(_) => {}
+			Val::Num(_) => {}
+			Val::Arr(a) => mark(a),
+			Val::Obj(o) => mark(o),
+			Val::Func(f) => mark(f),
+			Val::DebugGcTraceValue(v) => mark(v),
+		}
+	});
 }
 
 macro_rules! matches_unwrap {
@@ -368,7 +476,7 @@
 	pub fn unwrap_num(self) -> Result<f64> {
 		Ok(matches_unwrap!(self, Self::Num(v), v))
 	}
-	pub fn unwrap_func(self) -> Result<Rc<FuncVal>> {
+	pub fn unwrap_func(self) -> Result<Gc<FuncVal>> {
 		Ok(matches_unwrap!(self, Self::Func(v), v))
 	}
 	pub fn try_cast_bool(self, context: &'static str) -> Result<bool> {
@@ -392,6 +500,7 @@
 			Self::Bool(_) => ValType::Bool,
 			Self::Null => ValType::Null,
 			Self::Func(..) => ValType::Func,
+			Self::DebugGcTraceValue(v) => v.value.value_type(),
 		}
 	}