Adding move constructors

Author: JohnDumbell

src/goto-symex/goto_state.h

@@ -61,6 +61,11 @@ class goto_statet
   unsigned remaining_vccs = 0;
 
   /// Constructors
+  goto_statet() = default;
+  goto_statet &operator=(const goto_statet &other) = default;
+  goto_statet &operator=(goto_statet &&other) = default;
+  goto_statet(const goto_statet &other) = default;
+
   explicit goto_statet(const class goto_symex_statet &s);
 
   goto_statet(
@@ -69,6 +74,36 @@ class goto_statet
     : guard(true_exprt(), guard_manager), source(_source)
   {
   }
+
+  /// Partial-move constructor.
+  /// This will only move level2, value_set, guard and propagation fields. This
+  /// will mean that you shouldn't use it as an active state in symex, but you
+  /// can still look at its statistics and source values.
+  goto_statet(goto_statet &other, bool partial_move)
+    : depth(other.depth),
+      level2(std::move(other.level2)),
+      value_set(std::move(other.value_set)),
+      guard(std::move(other.guard)),
+      source(other.source),
+      propagation(std::move(other.propagation)),
+      atomic_section_id(other.atomic_section_id),
+      total_vccs(other.total_vccs),
+      remaining_vccs(other.remaining_vccs)
+  {
+  }
+
+  goto_statet(goto_statet &&other)
+    : depth(other.depth),
+      level2(std::move(other.level2)),
+      value_set(std::move(other.value_set)),
+      guard(std::move(other.guard)),
+      source(std::move(other.source)),
+      propagation(std::move(other.propagation)),
+      atomic_section_id(other.atomic_section_id),
+      total_vccs(other.total_vccs),
+      remaining_vccs(other.remaining_vccs)
+  {
+  }
 };
 
 #endif // CPROVER_GOTO_SYMEX_GOTO_STATE_H

src/goto-symex/renaming_level.h

@@ -125,6 +125,10 @@ struct symex_level2t : public symex_renaming_levelt
 
   symex_level2t() = default;
   ~symex_level2t() override = default;
+  symex_level2t &operator=(const symex_level2t &other) = default;
+  symex_level2t &operator=(symex_level2t &&other) = default;
+  symex_level2t(const symex_level2t &other) = default;
+  symex_level2t(symex_level2t &&other) = default;
 };
 
 /// Undo all levels of renaming

src/goto-symex/symex_target.h

@@ -53,6 +53,15 @@ class symex_targett
         pc(_goto_program.instructions.begin())
     {
     }
+
+    sourcet(sourcet &&other) noexcept
+      : thread_nr(other.thread_nr), function_id(other.function_id), pc(other.pc)
+    {
+    }
+
+    sourcet(const sourcet &other) = default;
+    sourcet &operator=(const sourcet &other) = default;
+    sourcet &operator=(sourcet &&other) = default;
   };
 
   enum class assignment_typet

src/pointer-analysis/value_set.h

@@ -45,6 +45,11 @@ class value_sett
   {
   }
 
+  value_sett(value_sett &&other)
+    : location_number(other.location_number), values(std::move(other.values))
+  {
+  }
+
   virtual ~value_sett() = default;
 
   value_sett(const value_sett &other) = default;