Make FrameStates recursive (to be used for inlining).

src/compiler/instruction.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_INSTRUCTION_H_
 #define V8_COMPILER_INSTRUCTION_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 684 matching lines @@
 
  private:
   Type type_;
   int64_t value_;
 };
 
 
 class FrameStateDescriptor : public ZoneObject {
  public:
   FrameStateDescriptor(BailoutId bailout_id, int parameters_count,
-                       int locals_count, int stack_count)
+                       int locals_count, int stack_count,
+                       FrameStateDescriptor* parent = NULL)

[Jarin, 2014/08/29 15:07:07]

Perhaps rename 'parent -> 'outer_state' (or 'outer'), so that it is clear which
way the nesting goes.

[sigurds, 2014/09/01 08:48:18]

Done.

       : bailout_id_(bailout_id),
         parameters_count_(parameters_count),
         locals_count_(locals_count),
-        stack_count_(stack_count) {}
+        stack_count_(stack_count),
+        parent_(parent) {}
 
   BailoutId bailout_id() const { return bailout_id_; }
   int parameters_count() { return parameters_count_; }
   int locals_count() { return locals_count_; }
   int stack_count() { return stack_count_; }
+  FrameStateDescriptor* parent() { return parent_; }
+  void set_parent(FrameStateDescriptor* parent) { parent_ = parent; }
 
   int size() { return parameters_count_ + locals_count_ + stack_count_; }
 
+  int GetFrameCount() {
+    int count = 0;
+    for (FrameStateDescriptor* iter = this; iter != NULL;
+         iter = iter->parent_) {
+      ++count;
+    }
+    return count;
+  }
+
  private:
   BailoutId bailout_id_;
   int parameters_count_;
   int locals_count_;
   int stack_count_;
+  FrameStateDescriptor* parent_;
 };
 
 OStream& operator<<(OStream& os, const Constant& constant);
 
 typedef ZoneDeque<Constant> ConstantDeque;
 typedef std::map<int, Constant, std::less<int>,
                  zone_allocator<std::pair<int, Constant> > > ConstantMap;
 
 typedef ZoneDeque<Instruction*> InstructionDeque;
 typedef ZoneDeque<PointerMap*> PointerMapDeque;
@@ skipping 128 matching lines @@
   DeoptimizationVector deoptimization_entries_;
 };
 
 OStream& operator<<(OStream& os, const InstructionSequence& code);
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_INSTRUCTION_H_