Reland "More lazy deoptimization in Turbofan (binops, loads/stores)"

src/compiler/code-generator.cc

 // Copyright 2013 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/code-generator.h"
 
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/pipeline.h"
 
@@ skipping 197 matching lines @@
 
   // No OSR in Turbofan yet...
   BailoutId osr_ast_id = BailoutId::None();
   data->SetOsrAstId(Smi::FromInt(osr_ast_id.ToInt()));
   data->SetOsrPcOffset(Smi::FromInt(-1));
 
   // Populate deoptimization entries.
   for (int i = 0; i < deopt_count; i++) {
     FrameStateDescriptor* descriptor = code()->GetDeoptimizationEntry(i);
     data->SetAstId(i, descriptor->bailout_id());
-    data->SetTranslationIndex(i, Smi::FromInt(0));
+    CHECK_NE(NULL, deoptimization_states_[i]);
+    data->SetTranslationIndex(
+        i, Smi::FromInt(deoptimization_states_[i]->translation_id_));
     data->SetArgumentsStackHeight(i, Smi::FromInt(0));
     data->SetPc(i, Smi::FromInt(-1));
   }
 
   // Populate the return address patcher entries.
   for (int i = 0; i < patch_count; ++i) {
     LazyDeoptimizationEntry entry = lazy_deoptimization_entries_[i];
     DCHECK(entry.position_after_call() == entry.continuation()->pos() ||
            IsNopForSmiCodeInlining(code_object, entry.position_after_call(),
                                    entry.continuation()->pos()));
@@ skipping 141 matching lines @@
   UNIMPLEMENTED();
   return false;
 }
 #endif
 
 #endif  // !V8_TURBOFAN_BACKEND
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8