Change the zone allocation api.

runtime/vm/assembler.cc

 // 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.
 
 #include "vm/assembler.h"
 
 #include "platform/utils.h"
 #include "vm/cpu.h"
 #include "vm/heap.h"
 #include "vm/memory_region.h"
 #include "vm/os.h"
 #include "vm/zone.h"
 
 namespace dart {
 
-static uword NewContents(int capacity) {
+static uword NewContents(intptr_t capacity) {
   Zone* zone = Isolate::Current()->current_zone();
-  uword result = zone->Allocate(capacity);
+  uword result = zone->AllocUnsafe(capacity);
 #if defined(DEBUG)
   // Initialize the buffer with kBreakPointInstruction to force a break
   // point if we ever execute an uninitialized part of the code buffer.
   Assembler::InitializeMemoryWithBreakpoints(result, capacity);
 #endif
   return result;
 }
 
 
 #if defined(DEBUG)
@@ skipping 12 matching lines @@
   ASSERT(!buffer->HasEnsuredCapacity());  // Cannot nest.
   buffer->has_ensured_capacity_ = true;
 }
 
 
 AssemblerBuffer::EnsureCapacity::~EnsureCapacity() {
   // Unmark the buffer, so we cannot emit after this.
   buffer_->has_ensured_capacity_ = false;
   // Make sure the generated instruction doesn't take up more
   // space than the minimum gap.
-  int delta = gap_ - ComputeGap();
+  intptr_t delta = gap_ - ComputeGap();
   ASSERT(delta <= kMinimumGap);
 }
 #endif
 
 
 AssemblerBuffer::AssemblerBuffer()
     : pointer_offsets_(new ZoneGrowableArray<int>(16)) {
-  static const int kInitialBufferCapacity = 4 * KB;
+  static const intptr_t kInitialBufferCapacity = 4 * KB;
   contents_ = NewContents(kInitialBufferCapacity);
   cursor_ = contents_;
   limit_ = ComputeLimit(contents_, kInitialBufferCapacity);
   fixup_ = NULL;
 #if defined(DEBUG)
   has_ensured_capacity_ = false;
   fixups_processed_ = false;
 #endif
 
   // Verify internal state.
@@ skipping 22 matching lines @@
 
   // Process fixups in the instructions.
   ProcessFixups(instructions);
 #if defined(DEBUG)
   fixups_processed_ = true;
 #endif
 }
 
 
 void AssemblerBuffer::ExtendCapacity() {
-  int old_size = Size();
-  int old_capacity = Capacity();
-  int new_capacity = Utils::Minimum(old_capacity * 2, old_capacity + 1 * MB);
+  intptr_t old_size = Size();
+  intptr_t old_capacity = Capacity();
+  intptr_t new_capacity =
+      Utils::Minimum(old_capacity * 2, old_capacity + 1 * MB);
+  if (new_capacity < old_capacity) {
+    FATAL("Unexpected overflow in AssemblerBuffer::ExtendCapacity");
+  }
 
   // Allocate the new data area and copy contents of the old one to it.
   uword new_contents = NewContents(new_capacity);
   memmove(reinterpret_cast<void*>(new_contents),
           reinterpret_cast<void*>(contents_),
           old_size);
 
   // Compute the relocation delta and switch to the new contents area.
   intptr_t delta = new_contents - contents_;
   contents_ = new_contents;
@@ skipping 60 matching lines @@
 
 void Assembler::Unreachable(const char* message) {
   const char* format = "Unreachable: %s";
   const intptr_t len = OS::SNPrint(NULL, 0, format, message);
   char* buffer = reinterpret_cast<char*>(malloc(len + 1));
   OS::SNPrint(buffer, len + 1, format, message);
   Stop(buffer);
 }
 
 }  // namespace dart