Don't forget to subtract materialization instructions when computing the offset of the frame pointe…

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.h"
 #include "vm/deopt_instructions.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
@@ skipping 347 matching lines @@
   entry_.fp_ = frames_.fp_;
   entry_.pc_ = frames_.pc_;
   SetupNextExitFrameData();  // Setup data for next exit frame in chain.
   ASSERT(entry_.IsValid());
   return &entry_;
 }
 
 
 InlinedFunctionsIterator::InlinedFunctionsIterator(const Code& code, uword pc)
   : index_(0),
+    num_materializations_(0),
     code_(Code::Handle(code.raw())),
     deopt_info_(DeoptInfo::Handle()),
     function_(Function::Handle()),
     pc_(pc),
     deopt_instructions_(),
     object_table_(Array::Handle()) {
   ASSERT(code_.is_optimized());
   ASSERT(pc_ != 0);
   ASSERT(code.ContainsInstructionAt(pc));
   intptr_t deopt_reason = kDeoptUnknown;
   deopt_info_ = code_.GetDeoptInfoAtPc(pc, &deopt_reason);
   if (deopt_info_.IsNull()) {
     // This is the case when a call without deopt info in optimized code
     // throws an exception. (e.g. in the parameter copying prologue).
     // In that case there won't be any inlined frames.
     function_ = code_.function();
   } else {
     // Unpack deopt info into instructions (translate away suffixes).
     const Array& deopt_table = Array::Handle(code_.deopt_info_array());
     ASSERT(!deopt_table.IsNull());
+
+    const intptr_t translation_len = deopt_info_.TranslationLength();
     deopt_info_.ToInstructions(deopt_table, &deopt_instructions_);
+    const intptr_t frame_size = deopt_info_.FrameSize();
+    num_materializations_ = translation_len - frame_size;

[Cutch, 2014/02/18 23:44:09]

Put in an accessor for this.

[turnidge, 2014/02/19 00:55:54]

Done.

     object_table_ = code_.object_table();
     Advance();
   }
 }
 
 
 void InlinedFunctionsIterator::Advance() {
   // Iterate over the deopt instructions and determine the inlined
   // functions if any and iterate over them.
   ASSERT(!Done());
@@ skipping 20 matching lines @@
 
 // Finds the potential offset for the current function's FP if the
 // current frame were to be deoptimized.
 intptr_t InlinedFunctionsIterator::GetDeoptFpOffset() const {
   ASSERT(deopt_instructions_.length() != 0);
   for (intptr_t index = index_;
        index < deopt_instructions_.length();
        index++) {
     DeoptInstr* deopt_instr = deopt_instructions_[index];
     if (deopt_instr->kind() == DeoptInstr::kCallerFp) {
-      return index;
+      return (index - num_materializations_);
     }
   }
   UNREACHABLE();
   return 0;
 }
 
 
 }  // namespace dart