diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-08-14T11·38+0300 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2022-08-30T17·13+0000 |
| commit | 3a67f912284e22f50bb54a6f6a533b2caf8929f8 (patch) | |
| tree | a992353eb46445c37eb9a20abc3cad5d9942500c | |
| parent | cfe37d36f7977f93dd5b8441d691811bf2b6997b (diff) | |
fix(tvix/eval): `?` operator should use OpAttrsOrNotFound r/4544
Using `OpAttrSelect`, the ? operator will fail when encountering a
nested value that is not an attribute set.
This however breaks valid code, such as:
{ bs = 42; } ? bs.a.b
The fix is simply to use the same operator used in the `or` statement,
which leaves a sentinal on the stack if a field is not found or the
value is not an attribute set.
Change-Id: Ib28fc8a96e6d592b4cdbc3e65ba129ad8faecd66
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6211
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
| -rw-r--r-- | tvix/eval/src/compiler.rs | 2 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-contains-nested-non-set.exp | 1 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-contains-nested-non-set.nix | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/tvix/eval/src/compiler.rs b/tvix/eval/src/compiler.rs index 6bb75f92c009..4b7a7b44a522 100644 --- a/tvix/eval/src/compiler.rs +++ b/tvix/eval/src/compiler.rs @@ -568,7 +568,7 @@ impl Compiler { self.compile_with_literal_ident(next)?; for fragment in fragments.into_iter().rev() { - self.chunk.push_op(OpCode::OpAttrsSelect); + self.chunk.push_op(OpCode::OpAttrOrNotFound); self.compile_with_literal_ident(fragment)?; } diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-contains-nested-non-set.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-contains-nested-non-set.exp new file mode 100644 index 000000000000..c508d5366f70 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-contains-nested-non-set.exp @@ -0,0 +1 @@ +false diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-contains-nested-non-set.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-contains-nested-non-set.nix new file mode 100644 index 000000000000..361ba9144594 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-contains-nested-non-set.nix @@ -0,0 +1,3 @@ +# ? operator should work even if encountering a non-set value on the +# walk +{ a.b = 42; } ? a.b.c |