Removal of the deoptimization block from Turbofan

src/compiler/instruction.cc

 // 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.
 
 #include "src/compiler/instruction.h"
 
 #include "src/compiler/common-operator.h"
 
 namespace v8 {
 namespace internal {
@@ skipping 376 matching lines @@
 }
 
 
 void InstructionSequence::AddGapMove(int index, InstructionOperand* from,
                                      InstructionOperand* to) {
   GapAt(index)->GetOrCreateParallelMove(GapInstruction::START, zone())->AddMove(
       from, to, zone());
 }
 
 
-int InstructionSequence::AddDeoptimizationEntry(
+InstructionSequence::StateId InstructionSequence::AddFrameStateDescriptor(
     FrameStateDescriptor* descriptor) {
   int deoptimization_id = static_cast<int>(deoptimization_entries_.size());
   deoptimization_entries_.push_back(descriptor);
-  return deoptimization_id;
+  return StateId::FromInt(deoptimization_id);
 }
 
-FrameStateDescriptor* InstructionSequence::GetDeoptimizationEntry(
-    int deoptimization_id) {
-  return deoptimization_entries_[deoptimization_id];
+FrameStateDescriptor* InstructionSequence::GetFrameStateDescriptor(
+    InstructionSequence::StateId state_id) {
+  return deoptimization_entries_[state_id.ToInt()];
 }
 
 
-int InstructionSequence::GetDeoptimizationEntryCount() {
+int InstructionSequence::GetFrameStateDescriptorCount() {
   return static_cast<int>(deoptimization_entries_.size());
 }
 
 
 OStream& operator<<(OStream& os, const InstructionSequence& code) {
   for (size_t i = 0; i < code.immediates_.size(); ++i) {
     Constant constant = code.immediates_[i];
     os << "IMM#" << i << ": " << constant << "\n";
   }
   int i = 0;
@@ skipping 54 matching lines @@
       os << " B" << (*iter)->id();
     }
     os << "\n";
   }
   return os;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8