diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-12-12T05·17-0800 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-12-12T14·55+0000 |
| commit | 9792920f8cdec92aa2c650de8cfd0a85fa7dce52 (patch) | |
| tree | baa5eb473824dc67af8965ef7b7cd9d69f6231a3 /tvix/eval/src/value/mod.rs | |
| parent | e54eeda0ff4b777899491e2a753481e9c73af7df (diff) | |
fix(tvix/eval): fix branching on catchable defaults (b/343) r/7178
This commit adds Opcode::OpJumpIfCatchable, which can be inserted ahead of most VM operations which expect a boolean on the stack, in order to handle catchables in branching position properly. Other than remembering to patch the jump, no other changes should be required. This commit also fixes b/343 by emitting this new opcode when compiling if-then-else. There are probably other places where we need to do the same thing. Change-Id: I48de3010014c0bbeba15d34fc0d4800e0bb5a1ef Reviewed-on: https://cl.tvl.fyi/c/depot/+/10288 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: Adam Joseph <adam@westernsemico.com>
Diffstat (limited to 'tvix/eval/src/value/mod.rs')
| -rw-r--r-- | tvix/eval/src/value/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tvix/eval/src/value/mod.rs b/tvix/eval/src/value/mod.rs index 003567bfd4..300824b88f 100644 --- a/tvix/eval/src/value/mod.rs +++ b/tvix/eval/src/value/mod.rs @@ -639,6 +639,7 @@ impl Value { gen_is!(is_number, Value::Integer(_) | Value::Float(_)); gen_is!(is_bool, Value::Bool(_)); gen_is!(is_attrs, Value::Attrs(_)); + gen_is!(is_catchable, Value::Catchable(_)); /// Compare `self` against other using (fallible) Nix ordering semantics. /// |