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

fix(tvix/eval): catchable-aware builtins

Browse source 
A bunch of operations in Tvix are not aware of catchable values
and does not propagate them.

In the meantime, as we wait for a better solution, we just offer this
commit for moving the needle.

Change-Id: Ic3f0e1550126b0847b597dfc1402c35e0eeef469
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10473
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Ryan Lahfa 2023-12-30 03:21:45 +01:00 • committed by raitobezarius
parent 37cc88897e
commit 2750e1e640
6 changed files with 328 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

64
tvix/eval/src/vm/mod.rs
View file

@ -646,7 +646,7 @@ impl<'o> VM<'o> {
// exactly.
OpCode::OpAssertBool => {
let val = self.stack_peek(0);
if !val.is_bool() {
if !val.is_catchable() && !val.is_bool() {
return frame.error(
self,
ErrorKind::TypeError {
@ -732,17 +732,17 @@ impl<'o> VM<'o> {
}
OpCode::OpConcat => {
let rhs = self
.stack_pop()
.to_list()
.with_span(&frame, self)?
.into_inner();
let lhs = self
.stack_pop()
.to_list()
.with_span(&frame, self)?
.into_inner();
self.stack.push(Value::List(NixList::from(lhs + rhs)))
// right hand side, left hand side
match (self.stack_pop(), self.stack_pop()) {
(Value::Catchable(cek), _) | (_, Value::Catchable(cek)) => {
self.stack.push(Value::Catchable(cek));
}
(rhs, lhs) => {
let rhs = rhs.to_list().with_span(&frame, self)?.into_inner();
let lhs = lhs.to_list().with_span(&frame, self)?.into_inner();
self.stack.push(Value::List(NixList::from(lhs + rhs)))
}
}
}
OpCode::OpResolveWith => {
@ -797,7 +797,12 @@ impl<'o> VM<'o> {
"OpValidateClosedFormals called within the frame of a lambda without formals",
);
let args = self.stack_peek(0).to_attrs().with_span(&frame, self)?;
let peeked = self.stack_peek(0);
if peeked.is_catchable() {
continue;
}
let args = peeked.to_attrs().with_span(&frame, self)?;
for arg in args.keys() {
if !formals.contains(arg) {
return frame.error(
@ -812,17 +817,24 @@ impl<'o> VM<'o> {
}
OpCode::OpAdd => {
let b = self.stack_pop();
let a = self.stack_pop();
match (self.stack_pop(), self.stack_pop()) {
(Value::Catchable(cek), _) | (_, Value::Catchable(cek)) => {
self.stack.push(Value::Catchable(cek));
}
let gen_span = frame.current_light_span();
self.push_call_frame(span, frame);
(b, a) => {
let gen_span = frame.current_light_span();
self.push_call_frame(span, frame);
// OpAdd can add not just numbers, but also string-like
// things, which requires more VM logic. This operation is
// evaluated in a generator frame.
self.enqueue_generator("add_values", gen_span, |co| add_values(co, a, b));
return Ok(false);
// OpAdd can add not just numbers, but also string-like
// things, which requires more VM logic. This operation is
// evaluated in a generator frame.
self.enqueue_generator("add_values", gen_span, |co| {
add_values(co, a, b)
});
return Ok(false);
}
}
}
OpCode::OpSub => {
@ -1204,6 +1216,10 @@ async fn resolve_with(
// TODO(tazjin): is this branch still live with the current with-thunking?
let with = fetch_forced_with(&co, with_stack_idx).await;
if with.is_catchable() {
return Ok(with);
}
match with.to_attrs()?.select(&ident) {
None => continue,
Some(val) => return Ok(val.clone()),
@ -1213,6 +1229,10 @@ async fn resolve_with(
for upvalue_with_idx in (0..upvalue_with_len).rev() {
let with = fetch_captured_with(&co, upvalue_with_idx).await;
if with.is_catchable() {
return Ok(with);
}
match with.to_attrs()?.select(&ident) {
None => continue,
Some(val) => return Ok(val.clone()),