From d67b910456e8d0d8756607a2ba43259d3aa3afd5 Mon Sep 17 00:00:00 2001
From: Cristian Cadar <c.cadar@imperial.ac.uk>
Date: Thu, 12 Dec 2019 19:21:18 +0000
Subject: Remove unnecessary std::move's that prevent copy elision

---
 lib/Core/Executor.cpp     |  4 ++--
 lib/Core/StatsTracker.cpp | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/Core')

diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
index 934fa43e..b10a8850 100644
--- a/lib/Core/Executor.cpp
+++ b/lib/Core/Executor.cpp
@@ -445,10 +445,10 @@ Executor::Executor(LLVMContext &ctx, const InterpreterOptions &opts,
 
   const time::Span maxTime{MaxTime};
   if (maxTime) timers.add(
-      std::move(std::make_unique<Timer>(maxTime, [&]{
+        std::make_unique<Timer>(maxTime, [&]{
         klee_message("HaltTimer invoked");
         setHaltExecution(true);
-      })));
+      }));
 
   coreSolverTimeout = time::Span{MaxCoreSolverTime};
   if (coreSolverTimeout) UseForkedCoreSolver = true;
diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp
index 5eac2cf2..51181db0 100644
--- a/lib/Core/StatsTracker.cpp
+++ b/lib/Core/StatsTracker.cpp
@@ -263,26 +263,26 @@ StatsTracker::StatsTracker(Executor &_executor, std::string _objectFilename,
     writeStatsLine();
 
     if (statsWriteInterval)
-      executor.timers.add(std::move(std::make_unique<Timer>(statsWriteInterval, [&]{
+      executor.timers.add(std::make_unique<Timer>(statsWriteInterval, [&]{
         writeStatsLine();
-      })));
+      }));
   }
 
   // Add timer to calculate uncovered instructions if needed by the solver
   if (updateMinDistToUncovered) {
     computeReachableUncovered();
-    executor.timers.add(std::move(std::make_unique<Timer>(time::Span{UncoveredUpdateInterval}, [&]{
+    executor.timers.add(std::make_unique<Timer>(time::Span{UncoveredUpdateInterval}, [&]{
       computeReachableUncovered();
-    })));
+    }));
   }
 
   if (OutputIStats) {
     istatsFile = executor.interpreterHandler->openOutputFile("run.istats");
     if (istatsFile) {
       if (iStatsWriteInterval)
-        executor.timers.add(std::move(std::make_unique<Timer>(iStatsWriteInterval, [&]{
+        executor.timers.add(std::make_unique<Timer>(iStatsWriteInterval, [&]{
           writeIStats();
-        })));
+        }));
     } else {
       klee_error("Unable to open instruction level stats file (run.istats).");
     }
-- 
cgit 1.4.1