More PcDescriptor cleanups.

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/dart.h"
 #include "vm/freelist.h"
 #include "vm/isolate.h"
@@ skipping 119 matching lines @@
       case kTypeArgumentsCid: {
         const RawTypeArguments* raw_array =
             reinterpret_cast<const RawTypeArguments*>(this);
         intptr_t array_length = Smi::Value(raw_array->ptr()->length_);
         instance_size = TypeArguments::InstanceSize(array_length);
         break;
       }
       case kPcDescriptorsCid: {
         const RawPcDescriptors* raw_descriptors =
             reinterpret_cast<const RawPcDescriptors*>(this);
-        intptr_t num_descriptors = raw_descriptors->ptr()->length_;
-        instance_size = PcDescriptors::InstanceSize(num_descriptors);
+        const intptr_t num_descriptors = raw_descriptors->ptr()->length_;
+        const intptr_t rec_size_in_bytes =
+            raw_descriptors->ptr()->record_size_in_bytes_;
+        instance_size = PcDescriptors::InstanceSize(num_descriptors,
+                                                    rec_size_in_bytes);
         break;
       }
       case kStackmapCid: {
         const RawStackmap* map = reinterpret_cast<const RawStackmap*>(this);
         intptr_t length = map->ptr()->length_;
         instance_size = Stackmap::InstanceSize(length);
         break;
       }
       case kLocalVarDescriptorsCid: {
         const RawLocalVarDescriptors* raw_descriptors =
@@ skipping 337 matching lines @@
     if ((pc >= start_pc) && (pc < end_pc)) {
       return true;
     }
   }
   return false;
 }
 
 
 intptr_t RawPcDescriptors::VisitPcDescriptorsPointers(
     RawPcDescriptors* raw_obj, ObjectPointerVisitor* visitor) {
-  return PcDescriptors::InstanceSize(raw_obj->ptr()->length_);
+  return PcDescriptors::InstanceSize(raw_obj->ptr()->length_,
+                                     raw_obj->ptr()->record_size_in_bytes_);
 }
 
 
 intptr_t RawStackmap::VisitStackmapPointers(RawStackmap* raw_obj,
                                             ObjectPointerVisitor* visitor) {
   return Stackmap::InstanceSize(raw_obj->ptr()->length_);
 }
 
 
 intptr_t RawLocalVarDescriptors::VisitLocalVarDescriptorsPointers(
@@ skipping 354 matching lines @@
 intptr_t RawUserTag::VisitUserTagPointers(
     RawUserTag* 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 UserTag::InstanceSize();
 }
 
 
 }  // namespace dart