From 46f9dd56da7d2af82148c47e40108f3c11ffe4d7 Mon Sep 17 00:00:00 2001
From: Carlo Nucera <carlo.nucera@protonmail.com>
Date: Thu, 6 Aug 2020 19:30:05 -0400
Subject: [PATCH] Fix bug due to non-deterministic arg eval order

---
 src/libstore/worker-protocol.hh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh
index 60543d626..1e8fd027c 100644
--- a/src/libstore/worker-protocol.hh
+++ b/src/libstore/worker-protocol.hh
@@ -121,9 +121,9 @@ struct WorkerProto<std::map<K, V>> {
         std::map<K, V> resMap;
         auto size = readNum<size_t>(from);
         while (size--) {
-            resMap.insert_or_assign(
-                WorkerProto<K>::read(store, from),
-                WorkerProto<V>::read(store, from));
+            auto k = WorkerProto<K>::read(store, from);
+            auto v = WorkerProto<V>::read(store, from);
+            resMap.insert_or_assign(std::move(k), std::move(v));
         }
         return resMap;
     }