[type-profile] Move type profile to its own files

Bug: v8:5933
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_chromium_rel_ng
Change-Id: If7d69844a309285ff53edb38688c3c647217fea2
Reviewed-on: https://chromium-review.googlesource.com/657379Reviewed-by: Yang Guo <yangguo@chromium.org>
Commit-Queue: Franziska Hinkelmann <franzih@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47937}

BUILD.gn

@@ -1524,6 +1524,8 @@ v8_source_set("v8_base") {
     "src/debug/debug-scopes.h",
     "src/debug/debug-stack-trace-iterator.cc",
     "src/debug/debug-stack-trace-iterator.h",
+    "src/debug/debug-type-profile.cc",
+    "src/debug/debug-type-profile.h",
     "src/debug/debug.cc",
     "src/debug/debug.h",
     "src/debug/interface-types.h",

src/api.cc

@@ -34,6 +34,7 @@
 #include "src/conversions-inl.h"
 #include "src/counters.h"
 #include "src/debug/debug-coverage.h"
+#include "src/debug/debug-type-profile.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/execution.h"

src/debug/debug-coverage.cc

@@ -564,91 +564,5 @@ void Coverage::SelectMode(Isolate* isolate, debug::Coverage::Mode mode) {
   isolate->set_code_coverage_mode(mode);
 }
 
-TypeProfile* TypeProfile::Collect(Isolate* isolate) {
-  TypeProfile* result = new TypeProfile();
-
-  // Collect existing feedback vectors.
-  std::vector<Handle<FeedbackVector>> feedback_vectors;
-  {
-    HeapIterator heap_iterator(isolate->heap());
-    while (HeapObject* current_obj = heap_iterator.next()) {
-      if (current_obj->IsFeedbackVector()) {
-        FeedbackVector* vector = FeedbackVector::cast(current_obj);
-        SharedFunctionInfo* shared = vector->shared_function_info();
-        if (!shared->IsSubjectToDebugging()) continue;
-        feedback_vectors.emplace_back(vector, isolate);
-      }
-    }
-  }
-
-  Script::Iterator scripts(isolate);
-
-  while (Script* script = scripts.Next()) {
-    if (!script->IsUserJavaScript()) {
-      continue;
-    }
-
-    Handle<Script> script_handle(script, isolate);
-
-    TypeProfileScript type_profile_script(script_handle);
-    std::vector<TypeProfileEntry>* entries = &type_profile_script.entries;
-
-    for (const auto& vector : feedback_vectors) {
-      SharedFunctionInfo* info = vector->shared_function_info();
-      DCHECK(info->IsSubjectToDebugging());
-
-      // Match vectors with script.
-      if (script != info->script()) {
-        continue;
-      }
-      if (info->feedback_metadata()->is_empty() ||
-          !info->feedback_metadata()->HasTypeProfileSlot()) {
-        continue;
-      }
-      FeedbackSlot slot = vector->GetTypeProfileSlot();
-      CollectTypeProfileNexus nexus(vector, slot);
-      Handle<String> name(info->DebugName(), isolate);
-      std::vector<int> source_positions = nexus.GetSourcePositions();
-      for (int position : source_positions) {
-        DCHECK_GE(position, 0);
-        entries->emplace_back(position, nexus.GetTypesForSourcePositions(
-                                            static_cast<uint32_t>(position)));
-      }
-
-      // Releases type profile data collected so far.
-      nexus.Clear();
-    }
-    if (!entries->empty()) {
-      result->emplace_back(type_profile_script);
-    }
-  }
-  return result;
-}
-
-void TypeProfile::SelectMode(Isolate* isolate, debug::TypeProfile::Mode mode) {
-  isolate->set_type_profile_mode(mode);
-  HandleScope handle_scope(isolate);
-
-  if (mode == debug::TypeProfile::Mode::kNone) {
-    // Release type profile data collected so far.
-    {
-      HeapIterator heap_iterator(isolate->heap());
-      while (HeapObject* current_obj = heap_iterator.next()) {
-        if (current_obj->IsFeedbackVector()) {
-          FeedbackVector* vector = FeedbackVector::cast(current_obj);
-          SharedFunctionInfo* info = vector->shared_function_info();
-          if (!info->IsSubjectToDebugging() ||
-              info->feedback_metadata()->is_empty() ||
-              !info->feedback_metadata()->HasTypeProfileSlot())
-            continue;
-          FeedbackSlot slot = vector->GetTypeProfileSlot();
-          CollectTypeProfileNexus nexus(vector, slot);
-          nexus.Clear();
-        }
-      }
-    }
-  }
-}
-
 }  // namespace internal
 }  // namespace v8

src/debug/debug-coverage.h

@@ -66,29 +66,6 @@ class Coverage : public std::vector<CoverageScript> {
   Coverage() {}
 };
 
-struct TypeProfileEntry {
-  explicit TypeProfileEntry(
-      int pos, std::vector<v8::internal::Handle<internal::String>> t)
-      : position(pos), types(std::move(t)) {}
-  int position;
-  std::vector<v8::internal::Handle<internal::String>> types;
-};
-
-struct TypeProfileScript {
-  explicit TypeProfileScript(Handle<Script> s) : script(s) {}
-  Handle<Script> script;
-  std::vector<TypeProfileEntry> entries;
-};
-
-class TypeProfile : public std::vector<TypeProfileScript> {
- public:
-  static TypeProfile* Collect(Isolate* isolate);
-  static void SelectMode(Isolate* isolate, debug::TypeProfile::Mode mode);
-
- private:
-  TypeProfile() {}
-};
-
 }  // namespace internal
 }  // namespace v8
 

src/debug/debug-type-profile.cc

+// Copyright 2017 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/debug/debug-type-profile.h"
+
+#include "src/feedback-vector.h"
+#include "src/isolate.h"
+#include "src/objects-inl.h"
+#include "src/objects.h"
+
+namespace v8 {
+namespace internal {
+
+TypeProfile* TypeProfile::Collect(Isolate* isolate) {
+  TypeProfile* result = new TypeProfile();
+
+  // Collect existing feedback vectors.
+  std::vector<Handle<FeedbackVector>> feedback_vectors;
+  {
+    HeapIterator heap_iterator(isolate->heap());
+    while (HeapObject* current_obj = heap_iterator.next()) {
+      if (current_obj->IsFeedbackVector()) {
+        FeedbackVector* vector = FeedbackVector::cast(current_obj);
+        SharedFunctionInfo* shared = vector->shared_function_info();
+        if (!shared->IsSubjectToDebugging()) continue;
+        feedback_vectors.emplace_back(vector, isolate);
+      }
+    }
+  }
+
+  Script::Iterator scripts(isolate);
+
+  while (Script* script = scripts.Next()) {
+    if (!script->IsUserJavaScript()) {
+      continue;
+    }
+
+    Handle<Script> script_handle(script, isolate);
+
+    TypeProfileScript type_profile_script(script_handle);
+    std::vector<TypeProfileEntry>* entries = &type_profile_script.entries;
+
+    for (const auto& vector : feedback_vectors) {
+      SharedFunctionInfo* info = vector->shared_function_info();
+      DCHECK(info->IsSubjectToDebugging());
+
+      // Match vectors with script.
+      if (script != info->script()) {
+        continue;
+      }
+      if (info->feedback_metadata()->is_empty() ||
+          !info->feedback_metadata()->HasTypeProfileSlot()) {
+        continue;
+      }
+      FeedbackSlot slot = vector->GetTypeProfileSlot();
+      CollectTypeProfileNexus nexus(vector, slot);
+      Handle<String> name(info->DebugName(), isolate);
+      std::vector<int> source_positions = nexus.GetSourcePositions();
+      for (int position : source_positions) {
+        DCHECK_GE(position, 0);
+        entries->emplace_back(position, nexus.GetTypesForSourcePositions(
+                                            static_cast<uint32_t>(position)));
+      }
+
+      // Releases type profile data collected so far.
+      nexus.Clear();
+    }
+    if (!entries->empty()) {
+      result->emplace_back(type_profile_script);
+    }
+  }
+  return result;
+}
+
+void TypeProfile::SelectMode(Isolate* isolate, debug::TypeProfile::Mode mode) {
+  isolate->set_type_profile_mode(mode);
+  HandleScope handle_scope(isolate);
+
+  if (mode == debug::TypeProfile::Mode::kNone) {
+    // Release type profile data collected so far.
+    {
+      HeapIterator heap_iterator(isolate->heap());
+      while (HeapObject* current_obj = heap_iterator.next()) {
+        if (current_obj->IsFeedbackVector()) {
+          FeedbackVector* vector = FeedbackVector::cast(current_obj);
+          SharedFunctionInfo* info = vector->shared_function_info();
+          if (!info->IsSubjectToDebugging() ||
+              info->feedback_metadata()->is_empty() ||
+              !info->feedback_metadata()->HasTypeProfileSlot())
+            continue;
+          FeedbackSlot slot = vector->GetTypeProfileSlot();
+          CollectTypeProfileNexus nexus(vector, slot);
+          nexus.Clear();
+        }
+      }
+    }
+  }
+}
+
+}  // namespace internal
+}  // namespace v8

src/debug/debug-type-profile.h

+// Copyright 2017 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_DEBUG_DEBUG_TYPE_PROFILE_H_
+#define V8_DEBUG_DEBUG_TYPE_PROFILE_H_
+
+#include <vector>
+
+#include "src/debug/debug-interface.h"
+#include "src/objects.h"
+
+namespace v8 {
+namespace internal {
+
+// Forward declaration.
+class Isolate;
+
+struct TypeProfileEntry {
+  explicit TypeProfileEntry(
+      int pos, std::vector<v8::internal::Handle<internal::String>> t)
+      : position(pos), types(std::move(t)) {}
+  int position;
+  std::vector<v8::internal::Handle<internal::String>> types;
+};
+
+struct TypeProfileScript {
+  explicit TypeProfileScript(Handle<Script> s) : script(s) {}
+  Handle<Script> script;
+  std::vector<TypeProfileEntry> entries;
+};
+
+class TypeProfile : public std::vector<TypeProfileScript> {
+ public:
+  static TypeProfile* Collect(Isolate* isolate);
+  static void SelectMode(Isolate* isolate, debug::TypeProfile::Mode mode);
+
+ private:
+  TypeProfile() {}
+};
+
+}  // namespace internal
+}  // namespace v8
+
+#endif  // V8_DEBUG_DEBUG_TYPE_PROFILE_H_

src/v8.gyp

@@ -917,6 +917,8 @@
         'debug/debug-scopes.h',
         'debug/debug-stack-trace-iterator.cc',
         'debug/debug-stack-trace-iterator.h',
+        'debug/debug-type-profile.cc',
+        'debug/debug-type-profile.h',
         'debug/debug.cc',
         'debug/debug.h',
         'debug/interface-types.h',