Reapply "Deoptimization support in inlined code."

runtime/vm/deopt_instructions.h

Index: runtime/vm/deopt_instructions.h
diff --git a/runtime/vm/deopt_instructions.h b/runtime/vm/deopt_instructions.h
index a7ee6f8510071f7fbac67a9304629436340a8a4a..e64dd7799933efb5c504b2480669ffc8e326b6b1 100644
--- a/runtime/vm/deopt_instructions.h
+++ b/runtime/vm/deopt_instructions.h
@@ -36,8 +36,11 @@ class DeoptimizationContext : public ValueObject {
     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);
@@ -64,6 +67,7 @@ class DeoptimizationContext : public ValueObject {
   intptr_t* registers_copy_;
   double* xmm_registers_copy_;
   const intptr_t num_args_;
+  intptr_t caller_fp_;
   Isolate* isolate_;
 
   DISALLOW_COPY_AND_ASSIGN(DeoptimizationContext);