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

diff --git a/third_party/nix/src/nix-instantiate/nix-instantiate.cc b/third_party/nix/src/nix-instantiate/nix-instantiate.cc
index 7b8d6dd3d61f..236037299d8b 100644
--- a/third_party/nix/src/nix-instantiate/nix-instantiate.cc
+++ b/third_party/nix/src/nix-instantiate/nix-instantiate.cc
@@ -23,7 +23,7 @@ static bool indirectRoot = false;
 enum OutputKind { okPlain, okXML, okJSON };
 
 void processExpr(EvalState& state, const Strings& attrPaths, bool parseOnly,
-                 bool strict, Bindings& autoArgs, bool evalOnly,
+                 bool strict, Bindings* autoArgs, bool evalOnly,
                  OutputKind output, bool location, Expr* e) {
   if (parseOnly) {
     std::cout << format("%1%\n") % *e;
@@ -40,7 +40,7 @@ void processExpr(EvalState& state, const Strings& attrPaths, bool parseOnly,
     PathSet context;
     if (evalOnly) {
       Value vRes;
-      if (autoArgs.empty()) {
+      if (autoArgs->empty()) {
         vRes = v;
       } else {
         state.autoCallFunction(autoArgs, v, vRes);
@@ -176,7 +176,7 @@ static int _main(int argc, char** argv) {
       });
     }
 
-    Bindings& autoArgs = *myArgs.getAutoArgs(*state);
+    std::unique_ptr<Bindings> autoArgs = myArgs.getAutoArgs(*state);
 
     if (attrPaths.empty()) {
       attrPaths = {""};
@@ -195,8 +195,8 @@ static int _main(int argc, char** argv) {
 
     if (readStdin) {
       Expr* e = state->parseStdin();
-      processExpr(*state, attrPaths, parseOnly, strict, autoArgs, evalOnly,
-                  outputKind, xmlOutputSourceLocation, e);
+      processExpr(*state, attrPaths, parseOnly, strict, autoArgs.get(),
+                  evalOnly, outputKind, xmlOutputSourceLocation, e);
     } else if (files.empty() && !fromArgs) {
       files.push_back("./default.nix");
     }
@@ -206,8 +206,8 @@ static int _main(int argc, char** argv) {
                     ? state->parseExprFromString(i, absPath("."))
                     : state->parseExprFromFile(resolveExprPath(
                           state->checkSourcePath(lookupFileArg(*state, i))));
-      processExpr(*state, attrPaths, parseOnly, strict, autoArgs, evalOnly,
-                  outputKind, xmlOutputSourceLocation, e);
+      processExpr(*state, attrPaths, parseOnly, strict, autoArgs.get(),
+                  evalOnly, outputKind, xmlOutputSourceLocation, e);
     }
 
     state->printStats();