Fix for issue 7757

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"
 #include "vm/object_store.h"
 #include "vm/os.h"
 #include "vm/parser.h"
 #include "vm/raw_object.h"
 #include "vm/stub_code.h"
 #include "vm/visitor.h"
 
 namespace dart {
@@ skipping 263 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_;
 }
 
+
+OptimizedDartFrameIterator::OptimizedDartFrameIterator(StackFrame* frame)
+    : index_(-1),

[srdjan, 2013/01/10 21:53:57]

set to 0

[siva, 2013/01/12 00:20:54]

Done.

+      frame_(frame),
+      func_(Function::Handle()),
+      deopt_info_(DeoptInfo::Handle()),
+      object_table_(Array::Handle()) {
+  ASSERT(frame_ != NULL);
+  const Code& code = Code::Handle(frame_->LookupDartCode());
+  ASSERT(code.is_optimized());
+  func_ = code.function();
+  intptr_t deopt_reason = kDeoptUnknown;
+  deopt_info_ = code.GetDeoptInfoAtPc(frame_->pc(), &deopt_reason);
+  object_table_ = code.object_table();
+  index_ = 0;

[srdjan, 2013/01/10 21:53:57]

remove

[siva, 2013/01/12 00:20:54]

Done.

+}
+
+
+RawFunction* OptimizedDartFrameIterator::GetNextFunction(uword* pc) {
+  if (index_ == -1) {
+    return Function::null();
+  }
+  if (deopt_info_.IsNull()) {
+    // We are at a PC that has no deoptimization info so there are no
+    // inlined functions to iterate over, we return the function.
+    index_ = -1;  // No more functions.
+    *pc = frame_->pc();
+    return func_.raw();
+  }
+  // Iterate over the deopt instructions and determine the inlined
+  // functions if any and iterate over them.
+  ASSERT(deopt_info_.Length() != 0);
+  while (index_ < deopt_info_.Length()) {
+    intptr_t cur_index = index_;
+    index_ += 1;
+    intptr_t deopt_instr = deopt_info_.Instruction(cur_index);
+    ASSERT(deopt_instr != DeoptInstr::kRetBeforeAddress);
+    if ((deopt_instr == DeoptInstr::kRetAfterAddress)) {
+      intptr_t deopt_from_index = deopt_info_.FromIndex(cur_index);
+      *pc = DeoptInstr::GetReturnAddress(deopt_instr,
+                                         deopt_from_index,
+                                         object_table_,
+                                         &func_);
+      return func_.raw();
+    }
+  }
+  index_ = -1;
+  return Function::null();
+}
+
 }  // namespace dart