Eliminate 99% of allocated ExceptionHandler objects

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 145 matching lines @@
       case kLocalVarDescriptorsCid: {
         const RawLocalVarDescriptors* raw_descriptors =
             reinterpret_cast<const RawLocalVarDescriptors*>(this);
         intptr_t num_descriptors = raw_descriptors->ptr()->num_entries_;
         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_;
+        intptr_t num_handlers = raw_handlers->ptr()->num_entries_;
         instance_size = ExceptionHandlers::InstanceSize(num_handlers);
         break;
       }
       case kDeoptInfoCid: {
         const RawDeoptInfo* raw_deopt_info =
             reinterpret_cast<const RawDeoptInfo*>(this);
         intptr_t num_entries = Smi::Value(raw_deopt_info->ptr()->length_);
         instance_size = DeoptInfo::InstanceSize(num_entries);
         break;
       }
@@ skipping 347 matching lines @@
     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);
 }
 
 
 intptr_t RawExceptionHandlers::VisitExceptionHandlersPointers(
     RawExceptionHandlers* raw_obj, ObjectPointerVisitor* visitor) {
   RawExceptionHandlers* obj = raw_obj->ptr();
-  intptr_t len = obj->length_;
+  intptr_t len = obj->num_entries_;
   visitor->VisitPointer(
       reinterpret_cast<RawObject**>(&obj->handled_types_data_));
   return ExceptionHandlers::InstanceSize(len);
 }
 
 
 intptr_t RawDeoptInfo::VisitDeoptInfoPointers(
     RawDeoptInfo* raw_obj, ObjectPointerVisitor* visitor) {
   RawDeoptInfo* obj = raw_obj->ptr();
   intptr_t length = Smi::Value(obj->length_);
@@ skipping 338 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