Change the zone allocation api.

runtime/vm/raw_object_snapshot.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/bigint_operations.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/snapshot.h"
 #include "vm/symbols.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 #define NEW_OBJECT(type)                                                       \
   ((kind == Snapshot::kFull) ? reader->New##type() : type::New())
 
 #define NEW_OBJECT_WITH_LEN(type, len)                                         \
   ((kind == Snapshot::kFull) ? reader->New##type(len) : type::New(len))
 
 
-static uword ZoneAllocator(intptr_t size) {
+static uword BigintAllocator(intptr_t size) {
   Zone* zone = Isolate::Current()->current_zone();
-  return zone->Allocate(size);
+  return zone->AllocUnsafe(size);
 }
 
 
 RawClass* Class::ReadFrom(SnapshotReader* reader,
                           intptr_t object_id,
                           intptr_t tags,
                           Snapshot::Kind kind) {
   ASSERT(reader != NULL);
 
   Class& cls = Class::ZoneHandle(reader->isolate(), Class::null());
@@ skipping 1184 matching lines @@
 
 
 RawBigint* Bigint::ReadFrom(SnapshotReader* reader,
                             intptr_t object_id,
                             intptr_t tags,
                             Snapshot::Kind kind) {
   ASSERT(reader != NULL);
 
   // Read in the HexCString representation of the bigint.
   intptr_t len = reader->ReadIntptrValue();
-  char* str = reinterpret_cast<char*>(ZoneAllocator(len + 1));
+  char* str = Isolate::Current()->current_zone()->Alloc<char>(len + 1);
   str[len] = '\0';
   reader->ReadBytes(reinterpret_cast<uint8_t*>(str), len);
 
   // Create a Bigint object from HexCString.
   Bigint& obj = Bigint::ZoneHandle(
       reader->isolate(),
       (kind == Snapshot::kFull) ? reader->NewBigint(str) :
                                   BigintOperations::FromHexCString(str));
 
   // If it is a canonical constant make it one.
@@ skipping 26 matching lines @@
   bool is_negative = false;
   if (length <= 0) {
     length = -length;
     is_negative = true;
   }
   uword data_start = reinterpret_cast<uword>(ptr()) + sizeof(RawBigint);
   const char* str = BigintOperations::ToHexCString(
       length,
       is_negative,
       reinterpret_cast<void*>(data_start),
-      &ZoneAllocator);
+      &BigintAllocator);
   bool neg = false;
   if (*str == '-') {
     neg = true;
     str++;
   }
   intptr_t len = strlen(str);
   ASSERT(len > 2 && str[0] == '0' && str[1] == 'x');
   if (neg) {
     writer->WriteIntptrValue(len - 1);  // Include '-' in length.
     writer->Write<uint8_t>('-');
@@ skipping 67 matching lines @@
 
 template<typename HandleType, typename CharacterType>
 void String::ReadFromImpl(SnapshotReader* reader,
                           HandleType* str_obj,
                           intptr_t len,
                           intptr_t tags) {
   ASSERT(reader != NULL);
   if (RawObject::IsCanonical(tags)) {
     // Set up canonical string object.
     ASSERT(reader != NULL);
-    CharacterType* ptr = reinterpret_cast<CharacterType*>(ZoneAllocator(len));
+    CharacterType* ptr =
+        Isolate::Current()->current_zone()->Alloc<CharacterType>(len);
     for (intptr_t i = 0; i < len; i++) {
       ptr[i] = reader->Read<CharacterType>();
     }
     *str_obj ^= Symbols::New(ptr, len);
   } else {
     // Set up the string object.
     *str_obj = HandleType::New(len, Heap::kNew);
     str_obj->set_tags(tags);
     str_obj->SetHash(0);  // Will get computed when needed.
     for (intptr_t i = 0; i < len; i++) {
@@ skipping 615 matching lines @@
   writer->Write<RawObject*>(ptr()->num_bracket_expressions_);
   writer->WriteObjectImpl(ptr()->pattern_);
   writer->WriteIntptrValue(ptr()->type_);
   writer->WriteIntptrValue(ptr()->flags_);
 
   // Do not write out the data part which is native.
 }
 
 
 }  // namespace dart