Deal with clang-tidy operator= suggestions

Summary: As title.

Reviewed By: ssj933

Differential Revision: D88289985

fbshipit-source-id: 2d8a66b19dbf2c4349614eadfe68fd045a3e8368

Author: agampe

libredex/IRInstruction.cpp

@@ -30,6 +30,7 @@ IRInstruction::IRInstruction(const IRInstruction& other)
     : m_opcode(other.m_opcode),
       m_num_srcs(other.m_num_srcs),
       m_dest(other.m_dest),
+      // TODO: This can trigger undefined behavior.
       m_literal(other.m_literal) {
   if (m_num_srcs <= MAX_NUM_INLINE_SRCS) {
     for (src_index_t i = 0; i < m_num_srcs; ++i) {
@@ -44,6 +45,26 @@ IRInstruction::IRInstruction(const IRInstruction& other)
   }
 }
 
+IRInstruction& IRInstruction::operator=(const IRInstruction& other) {
+  m_opcode = other.m_opcode;
+  m_num_srcs = other.m_num_srcs;
+  m_dest = other.m_dest;
+  // TODO: This can trigger undefined behavior.
+  m_literal = other.m_literal;
+  if (m_num_srcs <= MAX_NUM_INLINE_SRCS) {
+    for (src_index_t i = 0; i < m_num_srcs; ++i) {
+      m_inline_srcs[i] = other.m_inline_srcs[i];
+    }
+  } else {
+    m_srcs = new reg_t[m_num_srcs];
+    std::memcpy(m_srcs, other.m_srcs, m_num_srcs * sizeof(reg_t));
+  }
+  if (other.has_data()) {
+    m_data = other.m_data->clone();
+  }
+  return *this;
+}
+
 IRInstruction::~IRInstruction() {
   if (m_num_srcs > MAX_NUM_INLINE_SRCS) {
     delete[] m_srcs;

libredex/IRInstruction.h

@@ -139,6 +139,7 @@ class IRInstruction final {
  public:
   explicit IRInstruction(IROpcode op);
   IRInstruction(const IRInstruction&);
+  IRInstruction& operator=(const IRInstruction&);
   ~IRInstruction();
 
   /*

libredex/IRList.cpp

@@ -125,28 +125,30 @@ MethodItemEntry::MethodItemEntry(const MethodItemEntry& that)
   }
 }
 
-MethodItemEntry::~MethodItemEntry() {
-  switch (type) {
+namespace {
+
+void free_mie_contents(MethodItemEntry& mie) {
+  switch (mie.type) {
   case MFLOW_TRY:
-    delete tentry;
+    delete mie.tentry;
     break;
   case MFLOW_CATCH:
-    delete centry;
+    delete mie.centry;
     break;
   case MFLOW_TARGET:
-    delete target;
+    delete mie.target;
     break;
   case MFLOW_DEBUG:
-    dbgop.~unique_ptr<DexDebugInstruction>();
+    mie.dbgop.~unique_ptr<DexDebugInstruction>();
     break;
   case MFLOW_POSITION:
-    pos.~unique_ptr<DexPosition>();
+    mie.pos.~unique_ptr<DexPosition>();
     break;
   case MFLOW_SOURCE_BLOCK:
-    src_block.~unique_ptr<SourceBlock>();
+    mie.src_block.~unique_ptr<SourceBlock>();
     break;
   case MFLOW_DEX_OPCODE:
-    delete dex_insn;
+    delete mie.dex_insn;
     break;
   case MFLOW_OPCODE:
   case MFLOW_FALLTHROUGH:
@@ -155,6 +157,48 @@ MethodItemEntry::~MethodItemEntry() {
   }
 }
 
+} // namespace
+
+MethodItemEntry& MethodItemEntry::operator=(const MethodItemEntry& that) {
+  if (this == &that) {
+    return *this;
+  }
+  free_mie_contents(*this);
+  type = that.type;
+  switch (type) {
+  case MFLOW_TRY:
+    tentry = that.tentry;
+    break;
+  case MFLOW_CATCH:
+    centry = that.centry;
+    break;
+  case MFLOW_OPCODE:
+    insn = that.insn;
+    break;
+  case MFLOW_DEX_OPCODE:
+    dex_insn = that.dex_insn;
+    break;
+  case MFLOW_TARGET:
+    target = that.target;
+    break;
+  case MFLOW_DEBUG:
+    new (&dbgop) std::unique_ptr<DexDebugInstruction>(that.dbgop->clone());
+    break;
+  case MFLOW_POSITION:
+    new (&pos) std::unique_ptr<DexPosition>(new DexPosition(*that.pos));
+    break;
+  case MFLOW_SOURCE_BLOCK:
+    new (&src_block)
+        std::unique_ptr<SourceBlock>(new SourceBlock(*that.src_block));
+    break;
+  case MFLOW_FALLTHROUGH:
+    break;
+  }
+  return *this;
+}
+
+MethodItemEntry::~MethodItemEntry() { free_mie_contents(*this); }
+
 void MethodItemEntry::replace_ir_with_dex(DexInstruction* dex_insn) {
   always_assert(type == MFLOW_OPCODE);
   delete this->insn;
@@ -985,6 +1029,19 @@ void IRList::insn_clear_and_dispose() {
   });
 }
 
+SourceBlock& SourceBlock::operator=(const SourceBlock& other) {
+  if (this == &other) {
+    return *this;
+  }
+  src = other.src;
+  next = std::unique_ptr<SourceBlock>(
+      other.next == nullptr ? nullptr : new SourceBlock(*other.next));
+  id = other.id;
+  always_assert(vals_size == other.vals_size);
+  m_storage = make_storage(other.m_storage.get());
+  return *this;
+}
+
 std::unique_ptr<SourceBlock::Storage, SourceBlock::FreeDeleter>
 SourceBlock::make_storage(size_t vals_size, const Val& val) {
   if (vals_size == 0) {

libredex/IRList.h

@@ -193,6 +193,7 @@ struct SourceBlock {
         id(other.id),
         vals_size(other.vals_size),
         m_storage(make_storage(other.m_storage.get())) {}
+  SourceBlock& operator=(const SourceBlock&);
 
   boost::optional<float> get_val(size_t i) const {
     const auto& val = get_at(i);
@@ -583,6 +584,7 @@ struct MethodItemEntry {
     std::unique_ptr<SourceBlock> src_block;
   };
   MethodItemEntry(const MethodItemEntry&);
+  MethodItemEntry& operator=(const MethodItemEntry&);
   explicit MethodItemEntry(DexInstruction* dex_insn) {
     this->type = MFLOW_DEX_OPCODE;
     this->dex_insn = dex_insn;

libredex/PluginRegistry.h

@@ -84,6 +84,7 @@ class PluginRegistry {
    */
   PluginRegistry() {}
   PluginRegistry(const PluginRegistry&) = delete;
+  PluginRegistry& operator=(const PluginRegistry&) = delete;
 
   UnorderedMap<std::string, std::unique_ptr<Plugin>> m_registered_passes;
 };

libredex/ProguardConfiguration.h

@@ -106,6 +106,7 @@ struct KeepSpec {
   // instance of a KeepSpec in Redex. This makes it efficient and simple to
   // represent these KeepSpecs in the reachability graph.
   KeepSpec(const KeepSpec&) = delete;
+  KeepSpec& operator=(const KeepSpec&) = delete;
 
   friend bool operator==(const KeepSpec& lhs, const KeepSpec& rhs);
   friend std::ostream& operator<<(std::ostream&, const KeepSpec&);
@@ -203,6 +204,7 @@ struct ProguardConfiguration {
 
   ProguardConfiguration() = default;
   ProguardConfiguration(const ProguardConfiguration&) = delete;
+  ProguardConfiguration& operator=(const ProguardConfiguration&) = delete;
 };
 
 namespace impl {

opt/optimize_enums/EnumTransformer.cpp

@@ -1161,6 +1161,7 @@ class EnumTransformer final {
   }
 
   EnumTransformer(const EnumTransformer&) = delete;
+  EnumTransformer& operator=(const EnumTransformer&) = delete;
 
   void run() {
     auto scope = build_class_scope(m_stores);

opt/optimize_resources/OptimizeResources.h

@@ -65,6 +65,8 @@ struct ReachableResourcesPluginRegistry {
   ReachableResourcesPluginRegistry() {}
   ReachableResourcesPluginRegistry(const ReachableResourcesPluginRegistry&) =
       delete;
+  ReachableResourcesPluginRegistry& operator=(
+      const ReachableResourcesPluginRegistry&) = delete;
 
   std::vector<ReachableResourcesPlugin*> m_registered_plugins;
 };

tools/tool/ToolRegistry.h

@@ -42,6 +42,7 @@ struct ToolRegistry {
    */
   ToolRegistry() {}
   ToolRegistry(const ToolRegistry&) = delete;
+  ToolRegistry& operator=(const ToolRegistry&) = delete;
 
   std::vector<Tool*> m_registered_tools;
 };