Emit deoptimization information at static calls (preparation for full deoptimization). …

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/isolate.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
@@ skipping 116 matching lines @@
   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;
   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) {
+    // TryIndex is invalid for PcDescriptors::kDeoptIndex.
+    if ((static_cast<uword>(descriptors.PC(i)) == pc()) &&
+        (descriptors.DescriptorKind(i) != PcDescriptors::kDeoptIndex) &&
+        (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++) {
@@ skipping 93 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