Subzero: Reduce the amount of #ifdef'd code.

src/IceAssembler.cpp

 //===- subzero/src/IceAssembler.cpp - Assembler base class ----------------===//
 // Copyright (c) 2012, 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.
 //
 // Modified by the Subzero authors.
 //
 // This is forked from Dart revision 39313.
 // Please update the revision if we merge back changes from Dart.
 // https://code.google.com/p/dart/wiki/GettingTheSource
@@ skipping 27 matching lines @@
   AssemblerFixup *F =
       new (Assemblr.allocate<AssemblerFixup>()) AssemblerFixup();
   F->set_position(0);
   F->set_kind(Kind);
   F->set_value(Value);
   if (!Assemblr.getPreliminary())
     Fixups.push_back(F);
   return F;
 }
 
-#ifndef NDEBUG
-AssemblerBuffer::EnsureCapacity::EnsureCapacity(AssemblerBuffer *buffer) {
-  if (buffer->cursor() >= buffer->limit())
-    buffer->extendCapacity();
+void AssemblerBuffer::EnsureCapacity::validate(AssemblerBuffer *buffer) {

[John, 2015/06/23 22:28:30]

optional: s/buffer/Buffer/

?

If you want to avoid the name clash, then perhaps

s/buffer/Buf/

?

[Jim Stichnoth, 2015/06/24 21:27:27]

I think these naming inconsistencies come from trying to import Dart code while
minimizing changes, for easier merging in the future.  I know we've diverged a
bit, but I'm still hoping to keep that minimized (despite this CL's non-cosmetic
changes).

   // In debug mode, we save the assembler buffer along with the gap
   // size before we start emitting to the buffer. This allows us to
   // check that any single generated instruction doesn't overflow the
   // limit implied by the minimum gap size.
-  Buffer = buffer;
   Gap = computeGap();
   // Make sure that extending the capacity leaves a big enough gap
   // for any kind of instruction.
   assert(Gap >= kMinimumGap);
   // Mark the buffer as having ensured the capacity.
   assert(!buffer->hasEnsuredCapacity()); // Cannot nest.
   buffer->HasEnsuredCapacity = true;
 }
 
 AssemblerBuffer::EnsureCapacity::~EnsureCapacity() {
   // Unmark the buffer, so we cannot emit after this.
   Buffer->HasEnsuredCapacity = false;
   // Make sure the generated instruction doesn't take up more
   // space than the minimum gap.
   intptr_t delta = Gap - computeGap();
+  (void)delta;

[John, 2015/06/23 22:28:30]

optional: s/delta/Delta/?

[Jim Stichnoth, 2015/06/24 21:27:27]

(same response as above)

   assert(delta <= kMinimumGap);
 }
-#endif // !NDEBUG
 
 AssemblerBuffer::AssemblerBuffer(Assembler &Asm) : Assemblr(Asm) {
   const intptr_t OneKB = 1024;
   static const intptr_t kInitialBufferCapacity = 4 * OneKB;
   Contents = NewContents(Assemblr, kInitialBufferCapacity);
   Cursor = Contents;
   Limit = computeLimit(Contents, kInitialBufferCapacity);
-#ifndef NDEBUG
   HasEnsuredCapacity = false;
-#endif // !NDEBUG
 
   // Verify internal state.
   assert(capacity() == kInitialBufferCapacity);
   assert(size() == 0);
 }
 
 AssemblerBuffer::~AssemblerBuffer() = default;
 
 void AssemblerBuffer::extendCapacity() {
   intptr_t old_size = size();
@@ skipping 50 matching lines @@
   }
   // Handle any bytes that are not prefixed by a fixup.
   for (intptr_t i = CurPosition; i < EndPosition; ++i) {
     Str << "\t.byte 0x";
     Str.write_hex(Buffer.load<uint8_t>(i));
     Str << "\n";
   }
 }
 
 } // end of namespace Ice