From 90d8178009381fe7ad6f0380127df2bc5a0d1dc9 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 6 Nov 2021 19:50:27 +0100
Subject: [PATCH] Don't move the arguments of the primOp
Moving arguments of the primOp into the registration structure makes it
impossible to initialize a second EvalState with the correct primOp
registration. It will end up registering all those "RegisterPrimOp"'s
with an arity of zero on all but the 2nd instance of the EvalState.
Not moving the memory will add a tiny bit of memory overhead during the
eval since we need a copy of all the argument lists of all the primOp's.
The overhead shouldn't be too bad as it is static (based on the amonut
of registered operations) and only occurs once during the interpreter
startup.
---
src/libexpr/primops.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index c0d59da8c..d1f4d9009 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -3732,7 +3732,7 @@ void EvalState::createBaseEnv()
.fun = primOp.fun,
.arity = std::max(primOp.args.size(), primOp.arity),
.name = symbols.create(primOp.name),
- .args = std::move(primOp.args),
+ .args = primOp.args,
.doc = primOp.doc,
});