maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/eval): wrap Closure in Rc<> to match cppnix semantics

Browse source 
Change-Id: I595087eff943d38a9fc78a83d37e207bb2ab79bc
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7443
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Adam Joseph 2022-11-27 00:54:39 -08:00 • committed by tazjin
parent b3c34c3c61
commit e04b1697e4
6 changed files with 34 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tvix/eval/src/vm.rs
View file

@ -533,7 +533,7 @@ impl<'o> VM<'o> {
(v1, v2) => {
if allow_pointer_equality_on_functions_and_thunks {
if let (Value::Closure(c1), Value::Closure(c2)) = (&v1, &v2) {
if c1.ptr_eq(c2) {
if Rc::ptr_eq(c1, c2) {
continue;
}
}
@ -864,10 +864,10 @@ impl<'o> VM<'o> {
);
let mut upvalues = Upvalues::with_capacity(blueprint.upvalue_count);
self.populate_upvalues(upvalue_count, &mut upvalues)?;
self.push(Value::Closure(Closure::new_with_upvalues(
self.push(Value::Closure(Rc::new(Closure::new_with_upvalues(
Rc::new(upvalues),
blueprint,
)));
))));
}
OpCode::OpThunkSuspended(idx) | OpCode::OpThunkClosure(idx) => {