Revert of CpuProfiler: public API for deopt info in 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 19 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;
+};
+
+
 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);
@@ skipping 16 matching lines @@
   }
   const char* bailout_reason() const { return bailout_reason_; }
 
   void set_deopt_info(const char* deopt_reason, SourcePosition position,
                       size_t pc_offset) {
     DCHECK(deopt_position_.IsUnknown());
     deopt_reason_ = deopt_reason;
     deopt_position_ = position;
     pc_offset_ = pc_offset;
   }
-  CpuProfileDeoptInfo GetDeoptInfo();
+  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);
 
@@ skipping 69 matching lines @@
 
   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 std::vector<CpuProfileDeoptInfo>& 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_;
 
-  std::vector<CpuProfileDeoptInfo> deopt_infos_;
+  std::vector<DeoptInfo> deopt_infos_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileNode);
 };
 
 
 class ProfileTree {
  public:
   ProfileTree();
   ~ProfileTree();
 
@@ skipping 179 matching lines @@
   CodeEntry* gc_entry_;
   CodeEntry* unresolved_entry_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileGenerator);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_PROFILE_GENERATOR_H_