Split deopt-after and deopt-before handling:

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 70 matching lines @@
   DeoptInstr() {}
   virtual ~DeoptInstr() {}
 
   virtual const char* ToCString() const = 0;
 
   virtual void Execute(DeoptimizationContext* deopt_context,
                        intptr_t to_index) = 0;
 
  protected:
   enum Kind {
-    kSetRetAddress,
+    kSetRetAfterAddress,
+    kSetRetBeforeAddress,
     kCopyConstant,
     kCopyRegister,
     kCopyXmmRegister,
     kCopyStackSlot,
     kCopyDoubleStackSlot,
     kSetPcMarker,
     kSetCallerFp,
     kSetCallerPc,
   };
 
@@ skipping 14 matching lines @@
 class DeoptInfoBuilder : public ValueObject {
  public:
   // 'object_table' holds all objects referred to by DeoptInstr in
   // all DeoptInfo instances for a single Code object.
   DeoptInfoBuilder(const GrowableObjectArray& object_table,
                    const intptr_t num_args)
       : instructions_(),
         object_table_(object_table),
         num_args_(num_args) {}
 
-  // Will be neeeded for inlined functions, currently trivial.
-  void AddReturnAddress(const Function& function,
-                        intptr_t deopt_id,
-                        intptr_t to_index);
+  // Return address before instruction.
+  void AddReturnAddressBefore(const Function& function,
+                              intptr_t deopt_id,
+                              intptr_t to_index);
+
+  // Return address after instruction.
+  void AddReturnAddressAfter(const Function& function,
+                             intptr_t deopt_id,
+                             intptr_t to_index);
+
   // Copy from optimized frame to unoptimized.
   void AddCopy(const Location& from_loc,
                const Value& from_value,
                intptr_t to_index);
   void AddPcMarker(const Function& function, intptr_t to_index);
   void AddCallerFp(intptr_t to_index);
   void AddCallerPc(intptr_t to_index);
 
   RawDeoptInfo* CreateDeoptInfo() const;
 
  private:
   intptr_t FindOrAddObjectInTable(const Object& obj) const;
 
   GrowableArray<DeoptInstr*> instructions_;
   const GrowableObjectArray& object_table_;
   const intptr_t num_args_;
 
   DISALLOW_COPY_AND_ASSIGN(DeoptInfoBuilder);
 };
 
 }  // namespace dart
 
 #endif  // VM_DEOPT_INSTRUCTIONS_H_