Subzero: Do class definition cleanups for assembler files too.

src/assembler.h

Index: src/assembler.h
diff --git a/src/assembler.h b/src/assembler.h
index 46cf0100e4ab38d3862df2f4726559db63733481..bec0646e64fe88086bf385cee15715c9fe714e7d 100644
--- a/src/assembler.h
+++ b/src/assembler.h
@@ -40,6 +40,9 @@ class MemoryRegion;
 // information that needs to be processed before finalizing the code
 // into executable memory.
 class AssemblerFixup {
+  AssemblerFixup(const AssemblerFixup &) = delete;
+  AssemblerFixup &operator=(const AssemblerFixup &) = delete;
+
 public:
   virtual void Process(const MemoryRegion &region, intptr_t position) = 0;
 
@@ -64,13 +67,14 @@ private:
 
   void set_position(intptr_t position) { position_ = position; }
 
-  AssemblerFixup(const AssemblerFixup &) = delete;
-  AssemblerFixup &operator=(const AssemblerFixup &) = delete;
   friend class AssemblerBuffer;
 };
 
 // Assembler buffers are used to emit binary code. They grow on demand.
 class AssemblerBuffer {
+  AssemblerBuffer(const AssemblerBuffer &) = delete;
+  AssemblerBuffer &operator=(const AssemblerBuffer &) = delete;
+
 public:
   AssemblerBuffer(Assembler &);
   ~AssemblerBuffer();
@@ -120,6 +124,9 @@ public:
 
 #if defined(DEBUG)

[Jim Stichnoth, 2014/10/16 18:19:53]

Should this be "#if !defined(NDEBUG)"?  I.e., is this supposed to be similar to
assert()?

[jvoung (off chromium), 2014/10/16 19:02:37]

Ah yes, I forgot to change this when first bringing in the code.

Yes this is for an assert build, and it handily caught an instance where I
forgot to ensurecapacity for the segment override prefix. Added an ensure
capacity there.

   class EnsureCapacity {
+    EnsureCapacity(const EnsureCapacity &) = delete;
+    EnsureCapacity &operator=(const EnsureCapacity &) = delete;
+
   public:
     explicit EnsureCapacity(AssemblerBuffer *buffer);
     ~EnsureCapacity();
@@ -135,7 +142,10 @@ public:
   bool HasEnsuredCapacity() const { return has_ensured_capacity_; }
 #else
   class EnsureCapacity {
-  public:
+    EnsureCapacity(const EnsureCapacity &) = delete;
+    EnsureCapacity &operator=(const EnsureCapacity &) = delete;
+
+   public:
     explicit EnsureCapacity(AssemblerBuffer *buffer) {
       if (buffer->cursor() >= buffer->limit())
         buffer->ExtendCapacity();
@@ -191,6 +201,9 @@ private:
 };
 
 class Assembler {
+  Assembler(const Assembler &) = delete;
+  Assembler &operator=(const Assembler &) = delete;
+
 public:
   Assembler() {}
   ~Assembler() {}
@@ -212,9 +225,6 @@ public:
 
 private:
   llvm::BumpPtrAllocator Allocator;
-
-  Assembler(const Assembler &) = delete;
-  Assembler &operator=(const Assembler &) = delete;
 };
 
 } // end of namespace Ice