Reapply "Deoptimization support in inlined code."

runtime/vm/deopt_instructions.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/deopt_instructions.h"
 
 #include "vm/assembler_macros.h"
 #include "vm/intermediate_language.h"
 #include "vm/locations.h"
 #include "vm/parser.h"
@@ skipping 10 matching lines @@
       from_frame_(NULL),
       from_frame_size_(0),
       registers_copy_(NULL),
       xmm_registers_copy_(NULL),
       num_args_(num_args),
       isolate_(Isolate::Current()) {
   from_frame_ = isolate_->deopt_frame_copy();
   from_frame_size_ = isolate_->deopt_frame_copy_size();
   registers_copy_ = isolate_->deopt_cpu_registers_copy();
   xmm_registers_copy_ = isolate_->deopt_xmm_registers_copy();
+  caller_fp_ = GetFromFp();
 }
 
 
-intptr_t* DeoptimizationContext::GetFromFpAddress() const {
-  return &from_frame_[from_frame_size_ - 1 - num_args_ - 1];
+intptr_t DeoptimizationContext::GetFromFp() const {
+  return from_frame_[from_frame_size_ - 1 - num_args_ - 1];
 }
 
 
-intptr_t* DeoptimizationContext::GetFromPcAddress() const {
-  return &from_frame_[from_frame_size_ - 1 - num_args_];
+intptr_t DeoptimizationContext::GetFromPc() const {
+  return from_frame_[from_frame_size_ - 1 - num_args_];
+}
+
+intptr_t DeoptimizationContext::GetCallerFp() const {
+  return caller_fp_;
+}
+
+void DeoptimizationContext::SetCallerFp(intptr_t caller_fp) {
+  caller_fp_ = caller_fp;
 }
 
 // Deoptimization instruction moving value from optimized frame at
 // 'from_index' to specified slots in the unoptimized frame.
 // 'from_index' represents the slot index of the frame (0 being first argument)
 // and accounts for saved return address, frame pointer and pc marker.
 class DeoptStackSlotInstr : public DeoptInstr {
  public:
   explicit DeoptStackSlotInstr(intptr_t from_index)
       : stack_slot_index_(from_index) {
@@ skipping 276 matching lines @@
   DeoptCallerFpInstr() {}
 
   virtual intptr_t from_index() const { return 0; }
   virtual DeoptInstr::Kind kind() const { return kSetCallerFp; }
 
   virtual const char* ToCString() const {
     return "callerfp";
   }
 
   void Execute(DeoptimizationContext* deopt_context, intptr_t to_index) {
-    intptr_t* from_addr = deopt_context->GetFromFpAddress();
+    intptr_t from = deopt_context->GetCallerFp();
     intptr_t* to_addr = deopt_context->GetToFrameAddressAt(to_index);
-    *to_addr = *from_addr;
+    *to_addr = from;
+    deopt_context->SetCallerFp(reinterpret_cast<intptr_t>(to_addr));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeoptCallerFpInstr);
 };
 
 
 // Deoptimization instruction copying the caller return address from optimized
 // frame.
 class DeoptCallerPcInstr : public DeoptInstr {
  public:
   DeoptCallerPcInstr() {}
 
   virtual intptr_t from_index() const { return 0; }
   virtual DeoptInstr::Kind kind() const { return kSetCallerPc; }
 
   virtual const char* ToCString() const {
     return "callerpc";
   }
 
   void Execute(DeoptimizationContext* deopt_context, intptr_t to_index) {
-    intptr_t* from_addr = deopt_context->GetFromPcAddress();
+    intptr_t from = deopt_context->GetFromPc();
     intptr_t* to_addr = deopt_context->GetToFrameAddressAt(to_index);
-    *to_addr = *from_addr;
+    *to_addr = from;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeoptCallerPcInstr);
 };
 
 
 DeoptInstr* DeoptInstr::Create(intptr_t kind_as_int, intptr_t from_index) {
   Kind kind = static_cast<Kind>(kind_as_int);
   switch (kind) {
@@ skipping 104 matching lines @@
   const intptr_t len = instructions_.length();
   const DeoptInfo& deopt_info = DeoptInfo::Handle(DeoptInfo::New(len));
   for (intptr_t i = 0; i < len; i++) {
     DeoptInstr* instr = instructions_[i];
     deopt_info.SetAt(i, instr->kind(), instr->from_index());
   }
   return deopt_info.raw();
 }
 
 }  // namespace dart