Make stackmaps store their actual length.

runtime/vm/raw_object.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/raw_object.h"
 
 #include "vm/class_table.h"
 #include "vm/freelist.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
@@ skipping 190 matching lines @@
       }
       case kPcDescriptorsCid: {
         const RawPcDescriptors* raw_descriptors =
             reinterpret_cast<const RawPcDescriptors*>(this);
         intptr_t num_descriptors = Smi::Value(raw_descriptors->ptr()->length_);
         instance_size = PcDescriptors::InstanceSize(num_descriptors);
         break;
       }
       case kStackmapCid: {
         const RawStackmap* map = reinterpret_cast<const RawStackmap*>(this);
-        intptr_t size_in_bytes = Smi::Value(map->ptr()->bitmap_size_in_bytes_);
-        instance_size = Stackmap::InstanceSize(size_in_bytes);
+        intptr_t length = map->ptr()->length_;
+        instance_size = Stackmap::InstanceSize(length);
         break;
       }
       case kLocalVarDescriptorsCid: {
         const RawLocalVarDescriptors* raw_descriptors =
             reinterpret_cast<const RawLocalVarDescriptors*>(this);
         intptr_t num_descriptors = raw_descriptors->ptr()->length_;
         instance_size = LocalVarDescriptors::InstanceSize(num_descriptors);
         break;
       }
       case kExceptionHandlersCid: {
@@ skipping 254 matching lines @@
   RawPcDescriptors* obj = raw_obj->ptr();
   intptr_t length = Smi::Value(obj->length_);
   visitor->VisitPointer(reinterpret_cast<RawObject**>(&obj->length_));
   return PcDescriptors::InstanceSize(length);
 }
 
 
 intptr_t RawStackmap::VisitStackmapPointers(RawStackmap* raw_obj,
                                             ObjectPointerVisitor* visitor) {
   RawStackmap* obj = raw_obj->ptr();
-  intptr_t size_in_bytes = Smi::Value(obj->bitmap_size_in_bytes_);
-  visitor->VisitPointers(raw_obj->from(), raw_obj->to());
-  return Stackmap::InstanceSize(size_in_bytes);
+  intptr_t length = obj->length_;
+  visitor->VisitPointer(reinterpret_cast<RawObject**>(&obj->code_));
+  return Stackmap::InstanceSize(length);
 }
 
 
 intptr_t RawLocalVarDescriptors::VisitLocalVarDescriptorsPointers(
     RawLocalVarDescriptors* raw_obj, ObjectPointerVisitor* visitor) {
   RawLocalVarDescriptors* obj = raw_obj->ptr();
   intptr_t len = obj->length_;
   visitor->VisitPointer(reinterpret_cast<RawObject**>(&obj->names_));
   return LocalVarDescriptors::InstanceSize(len);
 }
@@ skipping 470 matching lines @@
 
 intptr_t RawWeakProperty::VisitWeakPropertyPointers(
     RawWeakProperty* raw_obj, ObjectPointerVisitor* visitor) {
   // Make sure that we got here with the tagged pointer as this.
   ASSERT(raw_obj->IsHeapObject());
   visitor->VisitPointers(raw_obj->from(), raw_obj->to());
   return WeakProperty::InstanceSize();
 }
 
 }  // namespace dart