Revert revision 40228

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 138 matching lines @@
       }
       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 =
             reinterpret_cast<const RawLocalVarDescriptors*>(this);
-        intptr_t num_descriptors = raw_descriptors->ptr()->num_entries_;
+        intptr_t num_descriptors = raw_descriptors->ptr()->length_;
         instance_size = LocalVarDescriptors::InstanceSize(num_descriptors);
         break;
       }
       case kExceptionHandlersCid: {
         const RawExceptionHandlers* raw_handlers =
             reinterpret_cast<const RawExceptionHandlers*>(this);
         intptr_t num_handlers = raw_handlers->ptr()->length_;
         instance_size = ExceptionHandlers::InstanceSize(num_handlers);
         break;
       }
@@ skipping 345 matching lines @@
 
 
 intptr_t RawStackmap::VisitStackmapPointers(RawStackmap* raw_obj,
                                             ObjectPointerVisitor* visitor) {
   return Stackmap::InstanceSize(raw_obj->ptr()->length_);
 }
 
 
 intptr_t RawLocalVarDescriptors::VisitLocalVarDescriptorsPointers(
     RawLocalVarDescriptors* raw_obj, ObjectPointerVisitor* visitor) {
-  intptr_t num_entries = raw_obj->ptr()->num_entries_;
-  visitor->VisitPointers(raw_obj->from(), raw_obj->to(num_entries));
-  return LocalVarDescriptors::InstanceSize(num_entries);
+  RawLocalVarDescriptors* obj = raw_obj->ptr();
+  intptr_t len = obj->length_;
+  visitor->VisitPointer(reinterpret_cast<RawObject**>(&obj->names_));
+  return LocalVarDescriptors::InstanceSize(len);
 }
 
 
 intptr_t RawExceptionHandlers::VisitExceptionHandlersPointers(
     RawExceptionHandlers* raw_obj, ObjectPointerVisitor* visitor) {
   RawExceptionHandlers* obj = raw_obj->ptr();
   intptr_t len = obj->length_;
   visitor->VisitPointer(
       reinterpret_cast<RawObject**>(&obj->handled_types_data_));
   return ExceptionHandlers::InstanceSize(len);
@@ skipping 345 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