Revert of CPUProfiler: Push deopt reason further to ProfileNode.

src/profile-generator.cc

 // Copyright 2012 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/v8.h"
 
 #include "src/profile-generator-inl.h"
 
 #include "src/compiler.h"
 #include "src/debug.h"
-#include "src/deoptimizer.h"
 #include "src/global-handles.h"
 #include "src/sampler.h"
 #include "src/scopeinfo.h"
 #include "src/unicode.h"
 
 namespace v8 {
 namespace internal {
 
 
 bool StringsStorage::StringsMatch(void* key1, void* key2) {
@@ skipping 130 matching lines @@
   if (it == pc_offset_map_.end()) {
     if (pc_offset_map_.empty()) return v8::CpuProfileNode::kNoLineNumberInfo;
     return (--pc_offset_map_.end())->second;
   }
   return it->second;
 }
 
 
 const char* const CodeEntry::kEmptyNamePrefix = "";
 const char* const CodeEntry::kEmptyResourceName = "";
-const char* const CodeEntry::kEmptyBailoutReason =
-    GetBailoutReason(BailoutReason::kNoReason);
-const char* const CodeEntry::kNoDeoptReason = "";
+const char* const CodeEntry::kEmptyBailoutReason = "";
 
 
 CodeEntry::~CodeEntry() {
   delete no_frame_ranges_;
   delete line_info_;
 }
 
 
 uint32_t CodeEntry::GetCallUid() const {
   uint32_t hash = ComputeIntegerHash(tag(), v8::internal::kZeroHashSeed);
@@ skipping 33 matching lines @@
 
 
 int CodeEntry::GetSourceLine(int pc_offset) const {
   if (line_info_ && !line_info_->empty()) {
     return line_info_->GetSourceLineNumber(pc_offset);
   }
   return v8::CpuProfileNode::kNoLineNumberInfo;
 }
 
 
-void ProfileNode::CollectDeoptInfo(CodeEntry* entry) {
-  deopt_infos_.Add(DeoptInfo(entry->deopt_reason(), entry->deopt_location()));
-  entry->clear_deopt_info();
-}
-
-
 ProfileNode* ProfileNode::FindChild(CodeEntry* entry) {
   HashMap::Entry* map_entry =
       children_.Lookup(entry, CodeEntryHash(entry), false);
   return map_entry != NULL ?
       reinterpret_cast<ProfileNode*>(map_entry->value) : NULL;
 }
 
 
 ProfileNode* ProfileNode::FindOrAddChild(CodeEntry* entry) {
   HashMap::Entry* map_entry =
       children_.Lookup(entry, CodeEntryHash(entry), true);
-  ProfileNode* node = reinterpret_cast<ProfileNode*>(map_entry->value);
-  if (node == NULL) {
+  if (map_entry->value == NULL) {
     // New node added.
-    node = new ProfileNode(tree_, entry);
-    map_entry->value = node;
-    children_list_.Add(node);
+    ProfileNode* new_node = new ProfileNode(tree_, entry);
+    map_entry->value = new_node;
+    children_list_.Add(new_node);
   }
-  if (entry->has_deopt_info()) node->CollectDeoptInfo(entry);
-  return node;
+  return reinterpret_cast<ProfileNode*>(map_entry->value);
 }
 
 
 void ProfileNode::IncrementLineTicks(int src_line) {
   if (src_line == v8::CpuProfileNode::kNoLineNumberInfo) return;
   // Increment a hit counter of a certain source line.
   // Add a new source line if not found.
   HashMap::Entry* e =
       line_ticks_.Lookup(reinterpret_cast<void*>(src_line), src_line, true);
   DCHECK(e);
@@ skipping 18 matching lines @@
         static_cast<unsigned int>(reinterpret_cast<uintptr_t>(p->key));
     entry->hit_count =
         static_cast<unsigned int>(reinterpret_cast<uintptr_t>(p->value));
   }
 
   return true;
 }
 
 
 void ProfileNode::Print(int indent) {
-  base::OS::Print("%5u %*s %s%s %d #%d", self_ticks_, indent, "",
+  base::OS::Print("%5u %*s %s%s %d #%d %s", self_ticks_, indent, "",
                   entry_->name_prefix(), entry_->name(), entry_->script_id(),
-                  id());
+                  id(), entry_->bailout_reason());
   if (entry_->resource_name()[0] != '\0')
     base::OS::Print(" %s:%d", entry_->resource_name(), entry_->line_number());
   base::OS::Print("\n");
-  for (auto info : deopt_infos_) {
-    base::OS::Print("%*s deopted at %d with reason '%s'\n", indent + 10, "",
-                    info.deopt_location, info.deopt_reason);
-  }
-  const char* bailout_reason = entry_->bailout_reason();
-  if (bailout_reason != GetBailoutReason(BailoutReason::kNoReason)) {
-    base::OS::Print("%*s bailed out due to '%s'\n", indent + 10, "",
-                    bailout_reason);
-  }
   for (HashMap::Entry* p = children_.Start();
        p != NULL;
        p = children_.Next(p)) {
     reinterpret_cast<ProfileNode*>(p->value)->Print(indent + 2);
   }
 }
 
 
 class DeleteNodesCallback {
  public:
@@ skipping 451 matching lines @@
     case OTHER:
     case EXTERNAL:
       return program_entry_;
     case IDLE:
       return idle_entry_;
     default: return NULL;
   }
 }
 
 } }  // namespace v8::internal