Change the stackmap builder API.

runtime/vm/code_descriptors.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/code_descriptors.h"
 
 namespace dart {
 
 void DescriptorList::AddDescriptor(PcDescriptors::Kind kind,
                                    intptr_t pc_offset,
@@ skipping 19 matching lines @@
                               (entry_point + PcOffset(i)),
                               Kind(i),
                               NodeId(i),
                               TokenIndex(i),
                               TryIndex(i));
   }
   return descriptors.raw();
 }
 
 
-void StackmapBuilder::AddEntry(intptr_t pc_offset) {
-  stack_map_ = Stackmap::New(pc_offset, builder_);
+void StackmapTableBuilder::AddEntry(intptr_t pc_offset,
+                                    BitmapBuilder* bitmap) {
+  stack_map_ = Stackmap::New(pc_offset, bitmap);
   list_.Add(stack_map_);
 }
 
 
-bool StackmapBuilder::Verify() {
+bool StackmapTableBuilder::Verify() {
   intptr_t num_entries = Length();
   Stackmap& map1 = Stackmap::Handle();
   Stackmap& map2 = Stackmap::Handle();
   for (intptr_t i = 1; i < num_entries; i++) {
     map1 = Map(i - 1);
     map2 = Map(i);
     // Ensure there are no duplicates and the entries are sorted.
     if (map1.PC() >= map2.PC()) {
       return false;
     }
   }
   return true;
 }
 
 
-RawArray* StackmapBuilder::FinalizeStackmaps(const Code& code) {
+RawArray* StackmapTableBuilder::FinalizeStackmaps(const Code& code) {
   ASSERT(Verify());
   intptr_t num_entries = Length();
   uword entry_point = code.EntryPoint();
   if (num_entries == 0) {
     return Array::Empty();
   }
   for (intptr_t i = 0; i < num_entries; i++) {
     stack_map_ = Map(i);
     stack_map_.SetPC(entry_point + stack_map_.PC());
     stack_map_.SetCode(code);
   }
   return Array::MakeArray(list_);
 }
 
 
-RawStackmap* StackmapBuilder::Map(int index) const {
+RawStackmap* StackmapTableBuilder::Map(int index) const {
   Stackmap& map = Stackmap::Handle();
   map ^= list_.At(index);
   return map.raw();
 }
 
 }  // namespace dart