Revert revision 40228

runtime/vm/raw_object.cc

Index: runtime/vm/raw_object.cc
===================================================================
--- runtime/vm/raw_object.cc	(revision 40230)
+++ runtime/vm/raw_object.cc	(working copy)
@@ -156,7 +156,7 @@
       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;
       }
@@ -522,9 +522,10 @@
 
 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);
 }