Fix issue 1857: code lookup was wrong when searching for exception handler.

runtime/vm/stack_frame.cc

 // Copyright (c) 2011, 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/code_index_table.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
@@ skipping 34 matching lines @@
 
 RawFunction* DartFrame::LookupDartFunction() const {
   // Get access to the code index table.
   ASSERT(Isolate::Current() != NULL);
   CodeIndexTable* code_index_table = Isolate::Current()->code_index_table();
   ASSERT(code_index_table != NULL);
   return code_index_table->LookupFunction(pc());
 }
 
 
+RawCode* DartFrame::LookupDartCode() const {
+  // Get access to the code index table.
+  ASSERT(Isolate::Current() != NULL);
+  CodeIndexTable* code_index_table = Isolate::Current()->code_index_table();
+  ASSERT(code_index_table != NULL);
+  return code_index_table->LookupCode(pc());
+}
+
+
 bool DartFrame::FindExceptionHandler(uword* handler_pc) const {
-  const Function& function = Function::Handle(LookupDartFunction());
-  ASSERT(!function.IsNull());
-  const Code& code = Code::Handle(function.code());
+  const Code& code = Code::Handle(LookupDartCode());
   ASSERT(!code.IsNull());
 
   // First try to find pc descriptor for the current pc.
   intptr_t try_index = -1;
   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);
@@ skipping 111 matching lines @@
 EntryFrame* StackFrameIterator::NextEntryFrame() {
   ASSERT(!frames_.HasNext());
   entry_.sp_ = frames_.sp_;
   entry_.fp_ = frames_.fp_;
   SetupNextExitFrameData();  // Setup data for next exit frame in chain.
   ASSERT(entry_.IsValid());
   return &entry_;
 }
 
 }  // namespace dart