CpuProfiler: Push inlining data forward to cpu profiler.

src/profile-generator.h

 // Copyright 2011 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_PROFILE_GENERATOR_H_
 #define V8_PROFILE_GENERATOR_H_
 
 #include <map>
 #include "include/v8-profiler.h"
 #include "src/allocation.h"
@@ skipping 18 matching lines @@
 
   bool empty() const { return pc_offset_map_.empty(); }
 
  private:
   // pc_offset -> source line
   typedef std::map<int, int> PcOffsetMap;
   PcOffsetMap pc_offset_map_;
   DISALLOW_COPY_AND_ASSIGN(JITLineInfoTable);
 };
 
+
+struct DeoptInfo {
+  const char* deopt_reason;
+  struct Frame {
+    int script_id;
+    int position;
+  };
+  std::vector<Frame> stack;
+  void AddInlineFrame(int script_id, int position) {
+    Frame frame = {script_id, position};
+    stack.push_back(frame);
+  }
+};
+
+
 class CodeEntry {
  public:
   // CodeEntry doesn't own name strings, just references them.
   inline CodeEntry(Logger::LogEventsAndTags tag, const char* name,
                    const char* name_prefix = CodeEntry::kEmptyNamePrefix,
                    const char* resource_name = CodeEntry::kEmptyResourceName,
                    int line_number = v8::CpuProfileNode::kNoLineNumberInfo,
                    int column_number = v8::CpuProfileNode::kNoColumnNumberInfo,
                    JITLineInfoTable* line_info = NULL,
                    Address instruction_start = NULL);
   ~CodeEntry();
 
   bool is_js_function() const { return is_js_function_tag(tag()); }
   const char* name_prefix() const { return name_prefix_; }
   bool has_name_prefix() const { return name_prefix_[0] != '\0'; }
   const char* name() const { return name_; }
   const char* resource_name() const { return resource_name_; }
   int line_number() const { return line_number_; }
   int column_number() const { return column_number_; }
   const JITLineInfoTable* line_info() const { return line_info_; }
   int script_id() const { return script_id_; }
   void set_script_id(int script_id) { script_id_ = script_id; }
   int position() const { return position_; }
   void set_position(int position) { position_ = position; }
   void set_bailout_reason(const char* bailout_reason) {
     bailout_reason_ = bailout_reason;
   }
   const char* bailout_reason() const { return bailout_reason_; }
 
-  void set_deopt_info(const char* deopt_reason, SourcePosition position) {
+  void set_deopt_info(const char* deopt_reason, SourcePosition position,
+                      int pc_offset) {
     DCHECK(deopt_position_.IsUnknown());
     deopt_reason_ = deopt_reason;
     deopt_position_ = position;
+    pc_offset_ = pc_offset;
   }
+  DeoptInfo GetDeoptInfo();
   const char* deopt_reason() const { return deopt_reason_; }
   SourcePosition deopt_position() const { return deopt_position_; }
   bool has_deopt_info() const { return !deopt_position_.IsUnknown(); }
   void clear_deopt_info() {
     deopt_reason_ = kNoDeoptReason;
     deopt_position_ = SourcePosition::Unknown();
   }
 
   void FillFunctionInfo(SharedFunctionInfo* shared);
 
   static inline bool is_js_function_tag(Logger::LogEventsAndTags tag);
 
   List<OffsetRange>* no_frame_ranges() const { return no_frame_ranges_; }
   void set_no_frame_ranges(List<OffsetRange>* ranges) {
     no_frame_ranges_ = ranges;
   }
+  void set_inlined_function_infos(std::vector<InlinedFunctionInfo>* infos) {
+    DCHECK(!inlined_function_infos_);
+    inlined_function_infos_ = infos;
+  }
+  std::vector<InlinedFunctionInfo>* ReleaseInlinedFunctionInfos() {
+    std::vector<InlinedFunctionInfo>* tmp = inlined_function_infos_;
+    inlined_function_infos_ = NULL;
+    return tmp;
+  }
 
   void SetBuiltinId(Builtins::Name id);
   Builtins::Name builtin_id() const {
     return BuiltinIdField::decode(bit_field_);
   }
 
   uint32_t GetHash() const;
   bool IsSameFunctionAs(CodeEntry* entry) const;
 
   int GetSourceLine(int pc_offset) const;
@@ skipping 15 matching lines @@
   const char* name_;
   const char* resource_name_;
   int line_number_;
   int column_number_;
   int script_id_;
   int position_;
   List<OffsetRange>* no_frame_ranges_;
   const char* bailout_reason_;
   const char* deopt_reason_;
   SourcePosition deopt_position_;
+  int pc_offset_;
   JITLineInfoTable* line_info_;
   Address instruction_start_;
 
+  std::vector<InlinedFunctionInfo>* inlined_function_infos_;
+
   DISALLOW_COPY_AND_ASSIGN(CodeEntry);
 };
 
 
 class ProfileTree;
 
 class ProfileNode {
- private:
-  struct DeoptInfo {
-    DeoptInfo(const char* deopt_reason, SourcePosition deopt_position)
-        : deopt_reason(deopt_reason), deopt_position(deopt_position) {}
-    DeoptInfo(const DeoptInfo& info)
-        : deopt_reason(info.deopt_reason),
-          deopt_position(info.deopt_position) {}
-    const char* deopt_reason;
-    SourcePosition deopt_position;
-  };
-
  public:
   inline ProfileNode(ProfileTree* tree, CodeEntry* entry);
 
   ProfileNode* FindChild(CodeEntry* entry);
   ProfileNode* FindOrAddChild(CodeEntry* entry);
   void IncrementSelfTicks() { ++self_ticks_; }
   void IncreaseSelfTicks(unsigned amount) { self_ticks_ += amount; }
   void IncrementLineTicks(int src_line);
 
   CodeEntry* entry() const { return entry_; }
   unsigned self_ticks() const { return self_ticks_; }
   const List<ProfileNode*>* children() const { return &children_list_; }
   unsigned id() const { return id_; }
   unsigned function_id() const;
   unsigned int GetHitLineCount() const { return line_ticks_.occupancy(); }
   bool GetLineTicks(v8::CpuProfileNode::LineTick* entries,
                     unsigned int length) const;
   void CollectDeoptInfo(CodeEntry* entry);
-  const List<DeoptInfo>& deopt_infos() const { return deopt_infos_; }
+  const std::vector<DeoptInfo>& deopt_infos() const { return deopt_infos_; }
 
   void Print(int indent);
 
   static bool CodeEntriesMatch(void* entry1, void* entry2) {
     return reinterpret_cast<CodeEntry*>(entry1)
         ->IsSameFunctionAs(reinterpret_cast<CodeEntry*>(entry2));
   }
 
  private:
   static uint32_t CodeEntryHash(CodeEntry* entry) { return entry->GetHash(); }
 
   static bool LineTickMatch(void* a, void* b) { return a == b; }
 
   ProfileTree* tree_;
   CodeEntry* entry_;
   unsigned self_ticks_;
   // Mapping from CodeEntry* to ProfileNode*
   HashMap children_;
   List<ProfileNode*> children_list_;
   unsigned id_;
   HashMap line_ticks_;
 
-  List<DeoptInfo> deopt_infos_;
+  std::vector<DeoptInfo> deopt_infos_;
+
   DISALLOW_COPY_AND_ASSIGN(ProfileNode);
 };
 
 
 class ProfileTree {
  public:
   ProfileTree();
   ~ProfileTree();
 
   ProfileNode* AddPathFromEnd(
@@ skipping 178 matching lines @@
   CodeEntry* gc_entry_;
   CodeEntry* unresolved_entry_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileGenerator);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_PROFILE_GENERATOR_H_