Simplify exception handler table

runtime/vm/stack_frame.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/stack_frame.h"
 
 #include "vm/assembler_macros.h"
 #include "vm/deopt_instructions.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
@@ skipping 134 matching lines @@
   return Code::null();
 }
 
 
 bool StackFrame::FindExceptionHandler(uword* handler_pc) const {
   const Code& code = Code::Handle(LookupDartCode());
   if (code.IsNull()) {
     return false;  // Stub frames do not have exception handlers.
   }
 
-  // First try to find pc descriptor for the current pc.
-  intptr_t try_index = -1;
+  // Find pc descriptor for the current pc.
   const PcDescriptors& descriptors =
       PcDescriptors::Handle(code.pc_descriptors());
   for (intptr_t i = 0; i < descriptors.Length(); i++) {
     if ((static_cast<uword>(descriptors.PC(i)) == pc()) &&
         (descriptors.TryIndex(i) != -1)) {
-      try_index = descriptors.TryIndex(i);
-      break;
-    }
-  }
-  if (try_index != -1) {
-    // We found a pc descriptor, now try to see if we have an
-    // exception catch handler for this try index.
-    const ExceptionHandlers& handlers =
-        ExceptionHandlers::Handle(code.exception_handlers());
-    for (intptr_t j = 0; j < handlers.Length(); j++) {
-      if (handlers.TryIndex(j) == try_index) {
-        *handler_pc = handlers.HandlerPC(j);
-        return true;
-      }
+      const intptr_t try_index = descriptors.TryIndex(i);
+      const ExceptionHandlers& handlers =
+          ExceptionHandlers::Handle(code.exception_handlers());
+      *handler_pc = handlers.HandlerPC(try_index);
+      return true;
     }
   }
   return false;
 }
 
 
 intptr_t StackFrame::GetTokenPos() const {
   const Code& code = Code::Handle(LookupDartCode());
   if (code.IsNull()) {
     return -1;  // Stub frames do not have token_pos.
@@ skipping 145 matching lines @@
                                            object_table_,
                                            &func_);
       return func_.raw();
     }
   }
   index_ = -1;
   return Function::null();
 }
 
 }  // namespace dart