Fix deoptimization address patching in Turbofan to use safepoints.

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.
-  void RecordSafepoint(PointerMap* pointers, Safepoint::Kind kind,
-                       int arguments, Safepoint::DeoptMode deopt_mode);
+  Safepoint::Id 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 14 matching lines @@
 
   // Interface used by the gap resolver to emit moves and swaps.
   virtual void AssembleMove(InstructionOperand* source,
                             InstructionOperand* destination) V8_OVERRIDE;
   virtual void AssembleSwap(InstructionOperand* source,
                             InstructionOperand* destination) V8_OVERRIDE;
 
   // ===========================================================================
   // Deoptimization table construction
   void AddSafepointAndDeopt(Instruction* instr);
-  void RecordLazyDeoptimizationEntry(Instruction* instr);
+  void UpdateSafepointsWithDeoptimizationPc();
+  void RecordLazyDeoptimizationEntry(Instruction* instr,
+                                     Safepoint::Id safepoint_id);
   void PopulateDeoptimizationData(Handle<Code> code);
   int DefineDeoptimizationLiteral(Handle<Object> literal);
   void BuildTranslation(Instruction* instr, int first_argument_index,
                         int deoptimization_id);
   void AddTranslationForOperand(Translation* translation, Instruction* instr,
                                 InstructionOperand* op);
   void AddNopForSmiCodeInlining();
   // ===========================================================================
 
   class LazyDeoptimizationEntry V8_FINAL {
    public:
     LazyDeoptimizationEntry(int position_after_call, Label* continuation,
-                            Label* deoptimization)
+                            Label* deoptimization, Safepoint::Id safepoint_id)
         : position_after_call_(position_after_call),
           continuation_(continuation),
-          deoptimization_(deoptimization) {}
+          deoptimization_(deoptimization),
+          safepoint_id_(safepoint_id) {}
 
     int position_after_call() const { return position_after_call_; }
     Label* continuation() const { return continuation_; }
     Label* deoptimization() const { return deoptimization_; }
+    Safepoint::Id safepoint_id() const { return safepoint_id_; }
 
    private:
     int position_after_call_;
     Label* continuation_;
     Label* deoptimization_;
+    Safepoint::Id safepoint_id_;
   };
 
   struct DeoptimizationState : ZoneObject {
     int translation_id_;
 
     explicit DeoptimizationState(int translation_id)
         : translation_id_(translation_id) {}
   };
 
   typedef std::deque<LazyDeoptimizationEntry,
@@ skipping 14 matching lines @@
   DeoptimizationStates deoptimization_states_;
   Literals deoptimization_literals_;
   TranslationBuffer translations_;
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_CODE_GENERATOR_H