Simplify exception handler table

runtime/vm/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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
@@ skipping 6857 matching lines @@
 intptr_t LocalVarDescriptors::Length() const {
   return raw_ptr()->length_;
 }
 
 
 intptr_t ExceptionHandlers::Length() const {
   return raw_ptr()->length_;
 }
 
 
-void ExceptionHandlers::SetHandlerInfo(intptr_t index,
-                                       intptr_t try_index,
+void ExceptionHandlers::SetHandlerInfo(intptr_t try_index,
                                        intptr_t outer_try_index,
                                        intptr_t handler_pc) const {
-  ASSERT((index >= 0) && (index < Length()));
-  RawExceptionHandlers::HandlerInfo* info = &raw_ptr()->data_[index];
-  info->try_index = try_index;
+  ASSERT((try_index >= 0) && (try_index < Length()));
+  RawExceptionHandlers::HandlerInfo* info = &raw_ptr()->data_[try_index];
   info->outer_try_index = outer_try_index;
   info->handler_pc = handler_pc;
 }
 
 void ExceptionHandlers::GetHandlerInfo(
-                            intptr_t index,
+                            intptr_t try_index,
                             RawExceptionHandlers::HandlerInfo* info) const {
-  ASSERT((index >= 0) && (index < Length()));
+  ASSERT((try_index >= 0) && (try_index < Length()));
   ASSERT(info != NULL);
-  RawExceptionHandlers::HandlerInfo* data = &raw_ptr()->data_[index];
-  info->try_index = data->try_index;
+  RawExceptionHandlers::HandlerInfo* data = &raw_ptr()->data_[try_index];
   info->outer_try_index = data->outer_try_index;
   info->handler_pc = data->handler_pc;
 }
 
 
-intptr_t ExceptionHandlers::TryIndex(intptr_t index) const {
-  ASSERT((index >= 0) && (index < Length()));
-  return raw_ptr()->data_[index].try_index;
+intptr_t ExceptionHandlers::HandlerPC(intptr_t try_index) const {
+  ASSERT((try_index >= 0) && (try_index < Length()));
+  return raw_ptr()->data_[try_index].handler_pc;
 }
 
 
-intptr_t ExceptionHandlers::HandlerPC(intptr_t index) const {
-  ASSERT((index >= 0) && (index < Length()));
-  return raw_ptr()->data_[index].handler_pc;
+intptr_t ExceptionHandlers::OuterTryIndex(intptr_t try_index) const {
+  ASSERT((try_index >= 0) && (try_index < Length()));
+  return raw_ptr()->data_[try_index].outer_try_index;
 }
 
 
-intptr_t ExceptionHandlers::OuterTryIndex(intptr_t index) const {
-  ASSERT((index >= 0) && (index < Length()));
-  return raw_ptr()->data_[index].outer_try_index;
+void ExceptionHandlers::SetHandledTypes(intptr_t try_index,
+                                        const Array& handled_types) const {
+  ASSERT((try_index >= 0) && (try_index < Length()));
+  const Array& handled_types_data =
+      Array::Handle(raw_ptr()->handled_types_data_);
+  handled_types_data.SetAt(try_index, handled_types);
 }
 
 
-void ExceptionHandlers::SetHandledTypes(intptr_t index,
-                                        const Array& handled_types) const {
-  ASSERT((index >= 0) && (index < Length()));
-  const Array& handled_types_data =
-      Array::Handle(raw_ptr()->handled_types_data_);
-  handled_types_data.SetAt(index, handled_types);
-}
-
-
-RawArray* ExceptionHandlers::GetHandledTypes(intptr_t index) const {
-  ASSERT((index >= 0) && (index < Length()));
+RawArray* ExceptionHandlers::GetHandledTypes(intptr_t try_index) const {
+  ASSERT((try_index >= 0) && (try_index < Length()));
   Array& array = Array::Handle(raw_ptr()->handled_types_data_);
-  array ^= array.At(index);
+  array ^= array.At(try_index);
   return array.raw();
 }
 
 
 void ExceptionHandlers::set_handled_types_data(const Array& value) const {
   StorePointer(&raw_ptr()->handled_types_data_, value.raw());
 }
 
 
 RawExceptionHandlers* ExceptionHandlers::New(intptr_t num_handlers) {
@@ skipping 29 matching lines @@
   // First compute the buffer size required.
   const char* kFormat = "%"Pd" => %#"Px"  (%"Pd" types) (outer %"Pd")\n";
   const char* kFormat2 = "  %d. %s\n";
   intptr_t len = 1;  // Trailing '\0'.
   for (intptr_t i = 0; i < Length(); i++) {
     GetHandlerInfo(i, &info);
     handled_types = GetHandledTypes(i);
     ASSERT(!handled_types.IsNull());
     intptr_t num_types = handled_types.Length();
     len += OS::SNPrint(NULL, 0, kFormat,
-                       info.try_index,
+                       i,
                        info.handler_pc,
                        num_types,
                        info.outer_try_index);
     for (int k = 0; k < num_types; k++) {
       type ^= handled_types.At(k);
       ASSERT(!type.IsNull());
       len += OS::SNPrint(NULL, 0, kFormat2, k, type.ToCString());
     }
   }
   // Allocate the buffer.
   char* buffer = Isolate::Current()->current_zone()->Alloc<char>(len);
   // Layout the fields in the buffer.
   intptr_t num_chars = 0;
   for (intptr_t i = 0; i < Length(); i++) {
     GetHandlerInfo(i, &info);
     handled_types = GetHandledTypes(i);
     intptr_t num_types = handled_types.Length();
     num_chars += OS::SNPrint((buffer + num_chars),
                              (len - num_chars),
                              kFormat,
-                             info.try_index,
+                             i,
                              info.handler_pc,
                              num_types,
                              info.outer_try_index);
     for (int k = 0; k < num_types; k++) {
       type ^= handled_types.At(k);
       num_chars += OS::SNPrint((buffer + num_chars),
                                (len - num_chars),
                                kFormat2, k, type.ToCString());
     }
   }
@@ skipping 5523 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart