Make FrameStates recursive (to be used for inlining).

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 292 matching lines @@
 int CodeGenerator::DefineDeoptimizationLiteral(Handle<Object> literal) {
   int result = static_cast<int>(deoptimization_literals_.size());
   for (unsigned i = 0; i < deoptimization_literals_.size(); ++i) {
     if (deoptimization_literals_[i].is_identical_to(literal)) return i;
   }
   deoptimization_literals_.push_back(literal);
   return result;
 }
 
 
+void CodeGenerator::BuildTranslationForFrameStateDescriptor(
+    FrameStateDescriptor* descriptor, Instruction* instr,
+    Translation* translation, int frame_state_offset) {
+  // Oldest parent must be added to translation first.
+  if (descriptor->parent() != NULL) {
+    BuildTranslationForFrameStateDescriptor(
+        descriptor->parent(), instr, translation,
+        frame_state_offset + descriptor->size());
+  }
+
+  translation->BeginJSFrame(
+      descriptor->bailout_id(), Translation::kSelfLiteralId,
+      descriptor->size() - descriptor->parameters_count());
+
+  for (int i = 0; i < descriptor->size(); i++) {
+    AddTranslationForOperand(translation, instr,
+                             instr->InputAt(i + frame_state_offset));
+  }
+}
+
+
 int CodeGenerator::BuildTranslation(Instruction* instr,
                                     int frame_state_offset) {
   InstructionOperandConverter i(this, instr);
   int deoptimization_id = i.InputInt32(frame_state_offset);
   frame_state_offset++;
 
   // We should build translation only once.
   DCHECK_EQ(NULL, deoptimization_states_[deoptimization_id]);
 
   FrameStateDescriptor* descriptor =
       code()->GetDeoptimizationEntry(deoptimization_id);
-  Translation translation(&translations_, 1, 1, zone());
-  translation.BeginJSFrame(descriptor->bailout_id(),
-                           Translation::kSelfLiteralId,
-                           descriptor->size() - descriptor->parameters_count());
-
-  for (int i = 0; i < descriptor->size(); i++) {
-    AddTranslationForOperand(&translation, instr,
-                             instr->InputAt(i + frame_state_offset));
-  }
+  int frame_count = descriptor->GetFrameCount();
+  Translation translation(&translations_, frame_count, frame_count, zone());
+  BuildTranslationForFrameStateDescriptor(descriptor, instr, &translation,
+                                          frame_state_offset);
 
   deoptimization_states_[deoptimization_id] =
       new (zone()) DeoptimizationState(translation.index());
 
   return deoptimization_id;
 }
 
 
 void CodeGenerator::AddTranslationForOperand(Translation* translation,
                                              Instruction* instr,
@@ skipping 71 matching lines @@
 }
 
 
 void CodeGenerator::AddNopForSmiCodeInlining() { UNIMPLEMENTED(); }
 
 #endif  // !V8_TURBOFAN_BACKEND
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8