Reapply "Deoptimization support in inlined code."

runtime/vm/deopt_instructions.h

 // 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.
 
 #ifndef VM_DEOPT_INSTRUCTIONS_H_
 #define VM_DEOPT_INSTRUCTIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/growable_array.h"
@@ skipping 18 matching lines @@
   intptr_t* GetFromFrameAddressAt(intptr_t index) const {
     ASSERT((0 <= index) && (index < from_frame_size_));
     return &from_frame_[index];
   }
 
   intptr_t* GetToFrameAddressAt(intptr_t index) const {
     ASSERT((0 <= index) && (index < to_frame_size_));
     return &to_frame_[index];
   }
 
-  intptr_t* GetFromFpAddress() const;
-  intptr_t* GetFromPcAddress() const;
+  intptr_t GetFromFp() const;
+  intptr_t GetFromPc() const;
+
+  intptr_t GetCallerFp() const;
+  void SetCallerFp(intptr_t callers_fp);
 
   RawObject* ObjectAt(intptr_t index) const {
     return object_table_.At(index);
   }
 
   intptr_t RegisterValue(Register reg) const {
     return registers_copy_[reg];
   }
 
   double XmmRegisterValue(XmmRegister reg) const {
     return xmm_registers_copy_[reg];
   }
 
   Isolate* isolate() const { return isolate_; }
 
   intptr_t from_frame_size() const { return from_frame_size_; }
 
  private:
   const Array& object_table_;
   intptr_t* to_frame_;
   const intptr_t to_frame_size_;
   intptr_t* from_frame_;
   intptr_t from_frame_size_;
   intptr_t* registers_copy_;
   double* xmm_registers_copy_;
   const intptr_t num_args_;
+  intptr_t caller_fp_;
   Isolate* isolate_;
 
   DISALLOW_COPY_AND_ASSIGN(DeoptimizationContext);
 };
 
 
 
 // Represents one deopt instruction, e.g, setup return address, store object,
 // store register, etc. The target is defined by instruction's position in
 // the deopt-info array.
@@ skipping 73 matching lines @@
   GrowableArray<DeoptInstr*> instructions_;
   const GrowableObjectArray& object_table_;
   const intptr_t num_args_;
 
   DISALLOW_COPY_AND_ASSIGN(DeoptInfoBuilder);
 };
 
 }  // namespace dart
 
 #endif  // VM_DEOPT_INSTRUCTIONS_H_