Simplify exception handler table

runtime/vm/object_test.cc

Index: runtime/vm/object_test.cc
===================================================================
--- runtime/vm/object_test.cc	(revision 17165)
+++ runtime/vm/object_test.cc	(working copy)
@@ -2731,16 +2731,14 @@
 
 
 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_;
@@ -2755,13 +2753,12 @@
   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));
 }