Renamed Zone->StackZone, BaseZone->Zone, in preparation for changing isolate->get_zone() to return …

runtime/lib/regexp_jsc.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.
 // This file encapsulates all the interaction with the
 // JSC regular expression library also referred to as pcre
 
 #include "lib/regexp_jsc.h"
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/exceptions.h"
 #include "vm/globals.h"
 #include "vm/isolate.h"
 #include "third_party/jscre/pcre.h"
 
 namespace dart {
 
 static uint16_t* GetTwoByteData(const String& str) {
-  Zone* zone = Isolate::Current()->current_zone();
+  StackZone* zone = Isolate::Current()->current_zone();
   uint16_t* two_byte_str = zone->Alloc<uint16_t>(str.Length());
   for (intptr_t i = 0; i < str.Length(); i++) {
     two_byte_str[i] = str.CharAt(i);
   }
   return two_byte_str;
 }
 
 
 static void* JSREMalloc(size_t size) {
   intptr_t regexp_size = static_cast<intptr_t>(size);
@@ skipping 80 matching lines @@
   // First convert the input str to UTF16 format as the jscre library expects
   // strings to be in UTF16 encoding.
   uint16_t* two_byte_str = GetTwoByteData(str);
 
   // Execute a regex match by calling into the jscre library.
   jscre::JSRegExp* jscregexp =
       reinterpret_cast<jscre::JSRegExp*>(regex.GetDataStartAddress());
   ASSERT(jscregexp != NULL);
   const Smi& num_bracket_exprs = Smi::Handle(regex.num_bracket_expressions());
   intptr_t num_bracket_expressions = num_bracket_exprs.Value();
-  Zone* zone = Isolate::Current()->current_zone();
+  StackZone* zone = Isolate::Current()->current_zone();
   // The jscre library rounds the passed in size to a multiple of 3 in order
   // to reuse the passed in offsets array as a temporary chunk of working
   // storage during matching, so we just pass in a size which is a multiple
   // of 3.
   const int kJscreMultiple = 3;
   int offsets_length = (num_bracket_expressions + 1) * kJscreMultiple;
   int* offsets = NULL;
   offsets = zone->Alloc<int>(offsets_length);
   int retval = jscre::jsRegExpExecute(jscregexp,
                                       two_byte_str,
@@ skipping 32 matching lines @@
        i += kMatchPair) {
     start = Smi::New(offsets[i]);
     end = Smi::New(offsets[i + 1]);
     array.SetAt(i, start);
     array.SetAt(i+1, end);
   }
   return array.raw();
 }
 
 }  // namespace dart