VM: [DBC] Fix GetDeoptFpOffset in the presence of materializations.

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 "platform/memory_sanitizer.h"
 #include "vm/assembler.h"
 #include "vm/deopt_instructions.h"
 #include "vm/isolate.h"
@@ skipping 534 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) {
+      intptr_t fp_offset = (index - num_materializations_);
 #if defined(TARGET_ARCH_DBC)
       // Stack on DBC is growing upwards but we record deopt commands
       // in the same order we record them on other architectures as if
       // the stack was growing downwards.
-      return dest_frame_size_ - index;
-#else
-      return (index - num_materializations_);
+      fp_offset = dest_frame_size_ - fp_offset;
 #endif
+      return fp_offset;
     }
   }
   UNREACHABLE();
   return 0;
 }
 
 
 #if defined(DEBUG)
 void ValidateFrames() {
   StackFrameIterator frames(StackFrameIterator::kValidateFrames);
   StackFrame* frame = frames.NextFrame();
   while (frame != NULL) {
     frame = frames.NextFrame();
   }
 }
 #endif
 
 
 }  // namespace dart