refactor(tvix): always pass Bindings by ptr, use shared/unique_ptr r/1658

Value now carries a shared_ptr<Bindings>, and all Bindings constructors return a unique_ptr<Bindings>.

The test that wanted to compare two Bindings by putting them into Values has been modified to use the new Equal() method on Bindings (extracted from EvalState).

Change-Id: I8dfb60e65fdabb717e3b3e5d56d5b3fc82f70883
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1744
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>

1 files changed, 4 insertions, 4 deletions

diff --git a/third_party/nix/src/nix/installables.cc b/third_party/nix/src/nix/installables.cc
index b257a26f23..dd1202586a 100644
--- a/third_party/nix/src/nix/installables.cc
+++ b/third_party/nix/src/nix/installables.cc
@@ -122,10 +122,10 @@ struct InstallableValue : Installable {
 
     auto v = toValue(*state);
 
-    Bindings& autoArgs = *cmd.getAutoArgs(*state);
+    std::unique_ptr<Bindings> autoArgs = cmd.getAutoArgs(*state);
 
     DrvInfos drvs;
-    getDerivations(*state, *v, "", autoArgs, drvs, false);
+    getDerivations(*state, *v, "", autoArgs.get(), drvs, false);
 
     Buildables res;
 
@@ -185,9 +185,9 @@ struct InstallableAttrPath final : InstallableValue {
   Value* toValue(EvalState& state) override {
     auto source = cmd.getSourceExpr(state);
 
-    Bindings& autoArgs = *cmd.getAutoArgs(state);
+    std::unique_ptr<Bindings> autoArgs = cmd.getAutoArgs(state);
 
-    Value* v = findAlongAttrPath(state, attrPath, autoArgs, *source);
+    Value* v = findAlongAttrPath(state, attrPath, autoArgs.get(), *source);
     state.forceValue(*v);
 
     return v;