DBC: Fix reading locals out of a deopt frame.

runtime/vm/stack_frame.h

Index: runtime/vm/stack_frame.h
diff --git a/runtime/vm/stack_frame.h b/runtime/vm/stack_frame.h
index dac3e5fb714523dfb0f8bbaf14a9ddbfc7b3c1f1..268ca4a9998819930ed8b30b3cb92ef2bab75a7e 100644
--- a/runtime/vm/stack_frame.h
+++ b/runtime/vm/stack_frame.h
@@ -336,6 +336,7 @@ class InlinedFunctionsIterator : public ValueObject {
 
   intptr_t index_;
   intptr_t num_materializations_;
+  intptr_t dest_frame_size_;
   Code& code_;
   TypedData& deopt_info_;
   Function& function_;
@@ -346,9 +347,11 @@ class InlinedFunctionsIterator : public ValueObject {
   DISALLOW_COPY_AND_ASSIGN(InlinedFunctionsIterator);
 };
 
+
 #if !defined(TARGET_ARCH_DBC)
-DART_FORCE_INLINE static uword LocalVarAddress(uword fp, intptr_t index) {
-  return fp + (index * kWordSize);
+DART_FORCE_INLINE static intptr_t LocalVarIndex(intptr_t fp_offset,
+                                                intptr_t var_index) {
+  return fp_offset + var_index;
 }
 
 
@@ -367,6 +370,12 @@ DART_FORCE_INLINE static bool IsCalleeFrameOf(uword fp, uword other_fp) {
 static const uword kInterruptStackLimit = ~static_cast<uword>(0);
 #endif
 
+
+DART_FORCE_INLINE static uword LocalVarAddress(uword fp, intptr_t index) {
+  return fp + LocalVarIndex(0, index) * kWordSize;
+}
+
+
 }  // namespace dart
 
 #endif  // VM_STACK_FRAME_H_