Simplify exception handler table

runtime/vm/object.h

 // 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 2376 matching lines @@
   HEAP_OBJECT_IMPLEMENTATION(Stackmap, Object);
   friend class BitmapBuilder;
   friend class Class;
 };
 
 
 class ExceptionHandlers : public Object {
  public:
   intptr_t Length() const;
 
-  void GetHandlerInfo(intptr_t index,
+  void GetHandlerInfo(intptr_t try_index,
                       RawExceptionHandlers::HandlerInfo* info) const;
 
-  intptr_t TryIndex(intptr_t index) const;
-  intptr_t HandlerPC(intptr_t index) const;
-  intptr_t OuterTryIndex(intptr_t index) const;
+  intptr_t HandlerPC(intptr_t try_index) const;
+  intptr_t OuterTryIndex(intptr_t try_index) const;
 
-  void SetHandlerInfo(intptr_t index,
-                      intptr_t try_index,
+  void SetHandlerInfo(intptr_t try_index,
                       intptr_t outer_try_index,
                       intptr_t handler_pc) const;
 
-  RawArray* GetHandledTypes(intptr_t index) const;
-  void SetHandledTypes(intptr_t index, const Array& handled_types) const;
+  RawArray* GetHandledTypes(intptr_t try_index) const;
+  void SetHandledTypes(intptr_t try_index, const Array& handled_types) const;
 
   static intptr_t InstanceSize() {
     ASSERT(sizeof(RawExceptionHandlers) == OFFSET_OF(RawExceptionHandlers,
                                                      data_));
     return 0;
   }
   static intptr_t InstanceSize(intptr_t len) {
     return RoundedAllocationSize(
         sizeof(RawExceptionHandlers) +
             (len * sizeof(RawExceptionHandlers::HandlerInfo)));
@@ skipping 3830 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_