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

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 9793 matching lines @@
   return *(EntryAddr(index, kFromIndex));
 }
 
 
 intptr_t DeoptInfo::Instruction(intptr_t index) const {
   return *(EntryAddr(index, kInstruction));
 }
 
 
 intptr_t DeoptInfo::FrameSize() const {
-  intptr_t pos = 0;
-  while (Instruction(pos) == DeoptInstr::kMaterializeObject) {
-    pos++;
-  }
-  return TranslationLength() - pos;
+  return TranslationLength() - NumMaterializations();
 }
 
 
 intptr_t DeoptInfo::TranslationLength() const {
   intptr_t length = Length();
   if (Instruction(length - 1) != DeoptInstr::kSuffix) return length;
 
   // If the last command is a suffix, add in the length of the suffix and
   // do not count the suffix command as a translation command.
   intptr_t ignored = 0;
   intptr_t suffix_length =
       DeoptInstr::DecodeSuffix(FromIndex(length - 1), &ignored);
   return length + suffix_length - 1;
 }
 
 
+intptr_t DeoptInfo::NumMaterializations() const {
+  intptr_t pos = 0;
+  while (Instruction(pos) == DeoptInstr::kMaterializeObject) {
+    pos++;
+  }
+  return pos;
+}
+
+
 void DeoptInfo::ToInstructions(const Array& table,
                                GrowableArray<DeoptInstr*>* instructions) const {
   ASSERT(instructions->is_empty());
   Smi& offset = Smi::Handle();
   DeoptInfo& info = DeoptInfo::Handle(raw());
   Smi& reason = Smi::Handle();
   intptr_t index = 0;
   intptr_t length = TranslationLength();
   while (index < length) {
     intptr_t instruction = info.Instruction(index);
@@ skipping 7590 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   Instance::PrintToJSONStream(stream, ref);
 }
 
 
 }  // namespace dart