From 8c8409c0d276581e17a52154b2f6429230c374eb Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 12 Dec 2023 03:18:38 -0800 Subject: fix(tvix/eval): builtins.getAttr: propagate catchables Change-Id: I84b6b8f8568d57614a03aff0d6069e0bc27357bf Reviewed-on: https://cl.tvl.fyi/c/depot/+/10310 Reviewed-by: tazjin Tested-by: BuildkiteCI Autosubmit: Adam Joseph --- tvix/eval/src/builtins/mod.rs | 6 ++++++ .../src/tests/tvix_tests/eval-okay-builtins-getAttr-catchable.exp | 1 + .../src/tests/tvix_tests/eval-okay-builtins-getAttr-catchable.nix | 1 + 3 files changed, 8 insertions(+) create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getAttr-catchable.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getAttr-catchable.nix (limited to 'tvix') diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index 58fe6bbbcb0c..8ae0ae02d6ad 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -466,6 +466,12 @@ mod pure_builtins { #[builtin("getAttr")] async fn builtin_get_attr(co: GenCo, key: Value, set: Value) -> Result { + if key.is_catchable() { + return Ok(key); + } + if set.is_catchable() { + return Ok(set); + } let k = key.to_str()?; let xs = set.to_attrs()?; diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getAttr-catchable.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getAttr-catchable.exp new file mode 100644 index 000000000000..c508d5366f70 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getAttr-catchable.exp @@ -0,0 +1 @@ +false diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getAttr-catchable.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getAttr-catchable.nix new file mode 100644 index 000000000000..ef4a042ffb83 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getAttr-catchable.nix @@ -0,0 +1 @@ +(builtins.tryEval (builtins.getAttr (throw "fred") "bob")).success -- cgit 1.4.1