From 43658a5b90786eb169471f02e6738359214343d9 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 14 Aug 2022 14:15:26 +0300 Subject: [PATCH] fix(tvix/eval): emit correct count in OpAttrPath Not sure how exactly this snuck in, but it caused some subtle breakages in deeply nested attribute sets. Change-Id: I8049ce912405d3750031f79cc8d86ff1c3c02c2b Reviewed-on: https://cl.tvl.fyi/c/depot/+/6208 Reviewed-by: grfn Tested-by: BuildkiteCI --- tvix/eval/src/compiler.rs | 2 +- .../eval/src/tests/tvix_tests/eval-okay-deeply-nested-attrs.exp | 1 + .../eval/src/tests/tvix_tests/eval-okay-deeply-nested-attrs.nix | 1 + tvix/eval/src/value/attrs.rs | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-deeply-nested-attrs.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-deeply-nested-attrs.nix diff --git a/tvix/eval/src/compiler.rs b/tvix/eval/src/compiler.rs index d4a34ba61..6bb75f92c 100644 --- a/tvix/eval/src/compiler.rs +++ b/tvix/eval/src/compiler.rs @@ -393,7 +393,7 @@ impl Compiler { // otherwise we need to emit an instruction to construct // the attribute path. if key_count > 1 { - self.chunk.push_op(OpCode::OpAttrPath(2)); + self.chunk.push_op(OpCode::OpAttrPath(key_count)); } // The value is just compiled as normal so that its diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-deeply-nested-attrs.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-deeply-nested-attrs.exp new file mode 100644 index 000000000..7cf54d959 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-deeply-nested-attrs.exp @@ -0,0 +1 @@ +{ a = { b = { c = { d = { e = { f = { g = "deep!"; }; }; }; }; }; }; } diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-deeply-nested-attrs.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-deeply-nested-attrs.nix new file mode 100644 index 000000000..91649d0c6 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-deeply-nested-attrs.nix @@ -0,0 +1 @@ +{ a.b.c.d.e.f.g = "deep!"; } diff --git a/tvix/eval/src/value/attrs.rs b/tvix/eval/src/value/attrs.rs index ca9263604..f61412855 100644 --- a/tvix/eval/src/value/attrs.rs +++ b/tvix/eval/src/value/attrs.rs @@ -253,7 +253,7 @@ impl NixAttrs { continue; } - other => panic!("unexpected attribute key type: {}", other.type_of()), + other => panic!("unexpected attribute key: {} :: {}", other, other.type_of()), } }