mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/eval): handle catchables in attribute set updates

Browse source 
Fixes b/346.

Change-Id: I277121d2363e605ebe09651ed9440fe1bc126c8c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10292
Tested-by: BuildkiteCI
Autosubmit: Adam Joseph <adam@westernsemico.com>
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Adam Joseph 2023-12-11 22:48:31 -08:00 committed by clbot
parent e54533518b
commit 289663cac4
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-update-attrs.exp → tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-update-attrs.exp
View file

0
tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-update-attrs.nix → tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-update-attrs.nix
View file

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

@ -661,10 +661,17 @@ impl<'o> VM<'o> {
OpCode::OpAttrs(Count(count)) => self.run_attrset(&frame, count)?, OpCode::OpAttrs(Count(count)) => self.run_attrset(&frame, count)?,
OpCode::OpAttrsUpdate => { OpCode::OpAttrsUpdate => {
let rhs = self.stack_pop().to_attrs().with_span(&frame, self)?; let rhs = self.stack_pop();
let lhs = self.stack_pop().to_attrs().with_span(&frame, self)?; let lhs = self.stack_pop();
if lhs.is_catchable() {
self.stack.push(Value::attrs(lhs.update(*rhs))) self.stack.push(lhs);
} else if rhs.is_catchable() {
self.stack.push(rhs);
} else {
let rhs = rhs.to_attrs().with_span(&frame, self)?;
let lhs = lhs.to_attrs().with_span(&frame, self)?;
self.stack.push(Value::attrs(lhs.update(*rhs)))
}
} }
OpCode::OpInvert => { OpCode::OpInvert => {