diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-12-12T09·52-0800 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-12-12T16·09+0000 |
| commit | 2949ee08f10f11a79af9b90933022ea40039462a (patch) | |
| tree | f61f28721fddbb7b981aaa66d4aa3d6d0166e254 /tvix/eval/src/tests | |
| parent | 52b68c053987c1567bacb6f14dad8ba92cd01afe (diff) | |
fix(tvix/eval): calling a catchable is catchable r/7187
When attempting to call a Value, if it is a Value::Catchable we must not cause an uncatchable failure. This commit simply reuses the Value::Catchable as the result of attempting to call it. This is safe because nix is designed so that nix code cannot distinguish between different catchable failures -- they all look the same to the interpreted code. This fixes b/351. Change-Id: Ibf763a08753e541843626182ff59fdbf15ea2959 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10300 Autosubmit: Adam Joseph <adam@westernsemico.com> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix/eval/src/tests')
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-attempt-to-call-catchable.exp | 1 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-attempt-to-call-catchable.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-attempt-to-call-catchable.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-attempt-to-call-catchable.exp new file mode 100644 index 000000000000..c508d5366f70 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-attempt-to-call-catchable.exp @@ -0,0 +1 @@ +false diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-attempt-to-call-catchable.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-attempt-to-call-catchable.nix new file mode 100644 index 000000000000..f4ef72a88b85 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-attempt-to-call-catchable.nix @@ -0,0 +1 @@ +(builtins.tryEval (throw "fred" 5)).success |