Simplify exception handler table

runtime/vm/raw_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_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 841 matching lines @@
   RAW_HEAP_OBJECT_IMPLEMENTATION(LocalVarDescriptors);
   intptr_t length_;  // Number of descriptors.
   RawArray* names_;  // Array of [length_] variable names.
 
   VarInfo data_[0];   // Variable info with [length_] entries.
 };
 
 
 class RawExceptionHandlers : public RawObject {
  public:
+  // The index into the ExceptionHandlers table corresponds to
+  // the try_index of the handler.
   struct HandlerInfo {
-    int16_t try_index;        // Try block index associated with handler.
-    int16_t outer_try_index;  // Try block index of enclosing try block.
-    intptr_t handler_pc;      // PC value of handler.
+    intptr_t outer_try_index;  // Try block index of enclosing try block.
+    intptr_t handler_pc;       // PC value of handler.
   };
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(ExceptionHandlers);
 
   // Number of exception handler entries.
   intptr_t length_;
 
   // Array with [length_] entries. Each entry is an array of all handled
   // exception types.
   RawArray* handled_types_data_;
@@ skipping 826 matching lines @@
          kExternalUint64ArrayCid == kExternalInt8ArrayCid + 8 &&
          kExternalFloat32ArrayCid == kExternalInt8ArrayCid + 9 &&
          kExternalFloat64ArrayCid == kExternalInt8ArrayCid + 10 &&
          kStacktraceCid == kExternalInt8ArrayCid + 11);
   return (index >= kExternalInt8ArrayCid && index <= kExternalFloat64ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_