Simplify exception handler table

runtime/vm/object_test.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 "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
@@ skipping 2713 matching lines @@
   Instructions& instructions = Instructions::Handle(code.instructions());
   typedef intptr_t (*EmbedSmiCode)();
   intptr_t retval =
       reinterpret_cast<EmbedSmiCode>(instructions.EntryPoint())();
   EXPECT((retval >> kSmiTagShift) == kSmiTestValue);
 }
 #endif
 
 
 TEST_CASE(ExceptionHandlers) {
-  const int kNumEntries = 6;
+  const int kNumEntries = 4;
   // Add an exception handler table to the code.
   ExceptionHandlers& exception_handlers = ExceptionHandlers::Handle();
   exception_handlers ^= ExceptionHandlers::New(kNumEntries);
-  exception_handlers.SetHandlerInfo(0, 10, -1, 20);
-  exception_handlers.SetHandlerInfo(1, 20, 25, 30);
-  exception_handlers.SetHandlerInfo(2, 30, 35, 40);
-  exception_handlers.SetHandlerInfo(3, 10, 15, 40);
-  exception_handlers.SetHandlerInfo(4, 10, 15, 80);
-  exception_handlers.SetHandlerInfo(5, 80, 1, 150);
+  exception_handlers.SetHandlerInfo(0, -1, 20);
+  exception_handlers.SetHandlerInfo(1, 0, 30);
+  exception_handlers.SetHandlerInfo(2, -1, 40);
+  exception_handlers.SetHandlerInfo(3, 1, 150);
 
   extern void GenerateIncrement(Assembler* assembler);
   Assembler _assembler_;
   GenerateIncrement(&_assembler_);
   Code& code = Code::Handle(Code::FinalizeCode(
       *CreateFunction("Test_Code"), &_assembler_));
   code.set_exception_handlers(exception_handlers);
 
   // Verify the exception handler table entries by accessing them.
   const ExceptionHandlers& handlers =
       ExceptionHandlers::Handle(code.exception_handlers());
   EXPECT_EQ(kNumEntries, handlers.Length());
   RawExceptionHandlers::HandlerInfo info;
   handlers.GetHandlerInfo(0, &info);
-  EXPECT_EQ(10, handlers.TryIndex(0));
-  EXPECT_EQ(10, info.try_index);
+  EXPECT_EQ(-1, handlers.OuterTryIndex(0));
   EXPECT_EQ(-1, info.outer_try_index);
   EXPECT_EQ(20, handlers.HandlerPC(0));
   EXPECT_EQ(20, info.handler_pc);
-  EXPECT_EQ(80, handlers.TryIndex(5));
-  EXPECT_EQ(150, handlers.HandlerPC(5));
+  EXPECT_EQ(1, handlers.OuterTryIndex(3));
+  EXPECT_EQ(150, handlers.HandlerPC(3));
 }
 
 
 TEST_CASE(PcDescriptors) {
   const int kNumEntries = 6;
   // Add PcDescriptors to the code.
   PcDescriptors& descriptors = PcDescriptors::Handle();
   descriptors ^= PcDescriptors::New(kNumEntries);
   descriptors.AddDescriptor(0, 10, PcDescriptors::kOther, 1, 20, 1);
   descriptors.AddDescriptor(1, 20, PcDescriptors::kDeoptBefore, 2, 30, 0);
@@ skipping 781 matching lines @@
   EXPECT_NE(test1.SourceFingerprint(), test3.SourceFingerprint());
   EXPECT_NE(test3.SourceFingerprint(), test4.SourceFingerprint());
   EXPECT_NE(test4.SourceFingerprint(), test5.SourceFingerprint());
   EXPECT_NE(test5.SourceFingerprint(), test6.SourceFingerprint());
   EXPECT_EQ(test6.SourceFingerprint(), test7.SourceFingerprint());
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart