Add DISALLOW_COPY_AND_ASSIGN to subclasses of ValueObject and make ValueObject copyable.

runtime/vm/assembler_x64.h

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_ASSEMBLER_X64_H_
 #define VM_ASSEMBLER_X64_H_
 
 #ifndef VM_ASSEMBLER_H_
 #error Do not include assembler_x64.h directly; use assembler.h instead.
 #endif
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/constants_x64.h"
 
 namespace dart {
 
 // Forward declarations.
 class RuntimeEntry;
 
 class Immediate : public ValueObject {
  public:
   explicit Immediate(int64_t value) : value_(value) { }
 
-  Immediate(const Immediate& other) : ValueObject(), value_(other.value_) { }
-
   int64_t value() const { return value_; }
 
   bool is_int8() const { return Utils::IsInt(8, value_); }
   bool is_uint8() const { return Utils::IsUint(8, value_); }
   bool is_uint16() const { return Utils::IsUint(16, value_); }
   bool is_int32() const { return Utils::IsInt(32, value_); }
 
  private:
   const int64_t value_;
 
-  // TODO(5411081): Add DISALLOW_COPY_AND_ASSIGN(Immediate) once the mac
-  // build issue is resolved.
-  // And remove the unnecessary copy constructor.
+  DISALLOW_COPY_AND_ASSIGN(Immediate);
 };
 
 
 class Operand : public ValueObject {
  public:
   uint8_t rex() const {
     return rex_;
   }
 
   uint8_t mod() const {
@@ skipping 22 matching lines @@
   int8_t disp8() const {
     ASSERT(length_ >= 2);
     return static_cast<int8_t>(encoding_[length_ - 1]);
   }
 
   int32_t disp32() const {
     ASSERT(length_ >= 5);
     return bit_copy<int32_t>(encoding_[length_ - 4]);
   }
 
-  Operand(const Operand& other)
-      : ValueObject(), length_(other.length_), rex_(other.rex_) {
-    memmove(&encoding_[0], &other.encoding_[0], other.length_);
-  }
-
-  Operand& operator=(const Operand& other) {
-    length_ = other.length_;
-    rex_ = other.rex_;
-    memmove(&encoding_[0], &other.encoding_[0], other.length_);
-    return *this;
-  }
-
  protected:
-  Operand() : length_(0), rex_(REX_NONE) { }  // Needed by subclass Address.
+  // Needed by subclass Address.
+  Operand() : length_(0), rex_(REX_NONE), encoding_() { }
 
   void SetModRM(int mod, Register rm) {
     ASSERT((mod & ~3) == 0);
     if ((rm > 7) && !((rm == R12) && (mod != 3))) {
       rex_ |= REX_B;
     }
     encoding_[0] = (mod << 6) | (rm & 7);
     length_ = 1;
   }
 
@@ skipping 83 matching lines @@
     } else if (Utils::IsInt(8, disp)) {
       SetModRM(1, RSP);
       SetSIB(scale, index, base);
       SetDisp8(disp);
     } else {
       SetModRM(2, RSP);
       SetSIB(scale, index, base);
       SetDisp32(disp);
     }
   }
-
-  Address(const Address& other) : Operand(other) { }
-
-  Address& operator=(const Address& other) {
-    Operand::operator=(other);
-    return *this;
-  }
 };
 
 
 class FieldAddress : public Address {
  public:
   FieldAddress(Register base, int32_t disp)
       : Address(base, disp - kHeapObjectTag) { }
 
   FieldAddress(Register base, Register index, ScaleFactor scale, int32_t disp)
       : Address(base, index, scale, disp - kHeapObjectTag) { }
-
-  FieldAddress(const FieldAddress& other) : Address(other) { }
-
-  FieldAddress& operator=(const FieldAddress& other) {
-    Address::operator=(other);
-    return *this;
-  }
 };
 
 
 class Label : public ValueObject {
  public:
   Label() : position_(0), unresolved_(0) {
 #ifdef DEBUG
     for (int i = 0; i < kMaxUnresolvedBranches; i++) {
       unresolved_near_positions_[i] = -1;
     }
@@ skipping 530 matching lines @@
   void EmitComplex(int rm, const Operand& operand, const Immediate& immediate);
   void EmitLabel(Label* label, int instruction_size);
   void EmitLabelLink(Label* label);
   void EmitNearLabelLink(Label* label);
 
   void EmitGenericShift(bool wide, int rm, Register reg, const Immediate& imm);
   void EmitGenericShift(bool wide, int rm, Register operand, Register shifter);
 
   void StoreIntoObjectFilter(Register object, Register value, Label* no_update);
 
-  DISALLOW_ALLOCATION();
   DISALLOW_COPY_AND_ASSIGN(Assembler);
 };
 
 
 inline void Assembler::EmitUint8(uint8_t value) {
   buffer_.Emit<uint8_t>(value);
 }
 
 
 inline void Assembler::EmitInt32(int32_t value) {
@@ skipping 62 matching lines @@
 }
 
 
 inline void Assembler::EmitOperandSizeOverride() {
   EmitUint8(0x66);
 }
 
 }  // namespace dart
 
 #endif  // VM_ASSEMBLER_X64_H_