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, 3 insertions, 3 deletions

diff --git a/third_party/nix/src/nix-build/nix-build.cc b/third_party/nix/src/nix-build/nix-build.cc
index 85b8a32462e8..1fb8a2f3ad4b 100644
--- a/third_party/nix/src/nix-build/nix-build.cc
+++ b/third_party/nix/src/nix-build/nix-build.cc
@@ -266,7 +266,7 @@ static void _main(int argc, char** argv) {
   auto state = std::make_unique<EvalState>(myArgs.searchPath, store);
   state->repair = repair;
 
-  Bindings& autoArgs = *myArgs.getAutoArgs(*state);
+  std::unique_ptr<Bindings> autoArgs = myArgs.getAutoArgs(*state);
 
   if (packages) {
     std::ostringstream joined;
@@ -334,9 +334,9 @@ static void _main(int argc, char** argv) {
     state->eval(e, vRoot);
 
     for (auto& i : attrPaths) {
-      Value& v(*findAlongAttrPath(*state, i, autoArgs, vRoot));
+      Value& v(*findAlongAttrPath(*state, i, autoArgs.get(), vRoot));
       state->forceValue(v);
-      getDerivations(*state, v, "", autoArgs, drvs, false);
+      getDerivations(*state, v, "", autoArgs.get(), drvs, false);
     }
   }