Remove deoptimization by patching the call stack.

src/compiler/code-generator.h

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_COMPILER_CODE_GENERATOR_H_
 #define V8_COMPILER_CODE_GENERATOR_H_
 
 #include <deque>
 
 #include "src/compiler/gap-resolver.h"
@@ skipping 28 matching lines @@
   Zone* zone() const { return code()->zone(); }
 
   // Checks if {block} will appear directly after {current_block_} when
   // assembling code, in which case, a fall-through can be used.
   bool IsNextInAssemblyOrder(const BasicBlock* block) const {
     return block->rpo_number_ == (current_block_->rpo_number_ + 1) &&
            block->deferred_ == current_block_->deferred_;
   }
 
   // Record a safepoint with the given pointer map.
-  Safepoint::Id RecordSafepoint(PointerMap* pointers, Safepoint::Kind kind,
-                                int arguments, Safepoint::DeoptMode deopt_mode);
+  void RecordSafepoint(PointerMap* pointers, Safepoint::Kind kind,
+                       int arguments, Safepoint::DeoptMode deopt_mode);
 
   // Assemble code for the specified instruction.
   void AssembleInstruction(Instruction* instr);
   void AssembleSourcePosition(SourcePositionInstruction* instr);
   void AssembleGap(GapInstruction* gap);
 
   // ===========================================================================
   // ============= Architecture-specific code generation methods. ==============
   // ===========================================================================
 
@@ skipping 16 matching lines @@
 
   // Interface used by the gap resolver to emit moves and swaps.
   virtual void AssembleMove(InstructionOperand* source,
                             InstructionOperand* destination) OVERRIDE;
   virtual void AssembleSwap(InstructionOperand* source,
                             InstructionOperand* destination) OVERRIDE;
 
   // ===========================================================================
   // Deoptimization table construction
   void AddSafepointAndDeopt(Instruction* instr);
-  void EmitLazyDeoptimizationCallTable();
   void PopulateDeoptimizationData(Handle<Code> code);
   int DefineDeoptimizationLiteral(Handle<Object> literal);
   FrameStateDescriptor* GetFrameStateDescriptor(Instruction* instr,
                                                 int frame_state_offset);
-  int BuildTranslation(Instruction* instr, int frame_state_offset,
+  int BuildTranslation(Instruction* instr, int pc_offset,
+                       int frame_state_offset,
                        OutputFrameStateCombine state_combine);
   void BuildTranslationForFrameStateDescriptor(
       FrameStateDescriptor* descriptor, Instruction* instr,
       Translation* translation, int frame_state_offset,
       OutputFrameStateCombine state_combine);
   void AddTranslationForOperand(Translation* translation, Instruction* instr,
                                 InstructionOperand* op);
   void AddNopForSmiCodeInlining();
   // ===========================================================================
 
-  class DeoptimizationPoint : public ZoneObject {
-   public:
-    int state_id() const { return state_id_; }
-    int lazy_state_id() const { return lazy_state_id_; }
-    FrameStateDescriptor* descriptor() const { return descriptor_; }
-    Safepoint::Id safepoint() const { return safepoint_; }
-
-    DeoptimizationPoint(int state_id, int lazy_state_id,
-                        FrameStateDescriptor* descriptor,
-                        Safepoint::Id safepoint)
-        : state_id_(state_id),
-          lazy_state_id_(lazy_state_id),
-          descriptor_(descriptor),
-          safepoint_(safepoint) {}
-
-   private:
-    int state_id_;
-    int lazy_state_id_;
-    FrameStateDescriptor* descriptor_;
-    Safepoint::Id safepoint_;
-  };
-
   struct DeoptimizationState : ZoneObject {
    public:
     BailoutId bailout_id() const { return bailout_id_; }
     int translation_id() const { return translation_id_; }
+    int pc_offset() const { return pc_offset_; }
 
-    DeoptimizationState(BailoutId bailout_id, int translation_id)
-        : bailout_id_(bailout_id), translation_id_(translation_id) {}
+    DeoptimizationState(BailoutId bailout_id, int translation_id, int pc_offset)
+        : bailout_id_(bailout_id),
+          translation_id_(translation_id),
+          pc_offset_(pc_offset) {}
 
    private:
     BailoutId bailout_id_;
     int translation_id_;
+    int pc_offset_;
   };
 
   InstructionSequence* code_;
   BasicBlock* current_block_;
   SourcePosition current_source_position_;
   MacroAssembler masm_;
   GapResolver resolver_;
   SafepointTableBuilder safepoints_;
-  ZoneDeque<DeoptimizationPoint*> deoptimization_points_;
   ZoneDeque<DeoptimizationState*> deoptimization_states_;
   ZoneDeque<Handle<Object> > deoptimization_literals_;
   TranslationBuffer translations_;
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_CODE_GENERATOR_H