Revert "src: enable detailed source positions in V8"

This reverts commit e2a8e32. This reverts commit 715bbb9. PR-URL: #24394 Fixes: #24393 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
nodejs · Nov 28, 2018 · a7f6c04 · a7f6c04
1 parent 81ec97b
commit a7f6c04
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 57 deletions.
diff --git a/deps/v8/include/v8-profiler.h b/deps/v8/include/v8-profiler.h
@@ -341,12 +341,6 @@ class V8_EXPORT CpuProfiler {
   V8_DEPRECATED("Use Isolate::SetIdle(bool) instead.",
                 void SetIdle(bool is_idle));
 
-  /**
-   * Generate more detailed source positions to code objects. This results in
-   * better results when mapping profiling samples to script source.
-   */
-  static void UseDetailedSourcePositionsForProfiling(Isolate* isolate);
-
  private:
   CpuProfiler();
   ~CpuProfiler();

diff --git a/deps/v8/src/api.cc b/deps/v8/src/api.cc
@@ -10132,11 +10132,6 @@ void CpuProfiler::SetIdle(bool is_idle) {
   isolate->SetIdle(is_idle);
 }
 
-void CpuProfiler::UseDetailedSourcePositionsForProfiling(Isolate* isolate) {
-  reinterpret_cast<i::Isolate*>(isolate)
-      ->set_detailed_source_positions_for_profiling(true);
-}
-
 uintptr_t CodeEvent::GetCodeStartAddress() {
   return reinterpret_cast<i::CodeEvent*>(this)->code_start_address;
 }

diff --git a/deps/v8/src/isolate.cc b/deps/v8/src/isolate.cc
@@ -3257,8 +3257,7 @@ bool Isolate::use_optimizer() {
 }
 
 bool Isolate::NeedsDetailedOptimizedCodeLineInfo() const {
-  return NeedsSourcePositionsForProfiling() ||
-         detailed_source_positions_for_profiling();
+  return NeedsSourcePositionsForProfiling() || FLAG_detailed_line_info;
 }
 
 bool Isolate::NeedsSourcePositionsForProfiling() const {

diff --git a/deps/v8/src/isolate.h b/deps/v8/src/isolate.h
@@ -553,8 +553,7 @@ typedef std::vector<HeapObject*> DebugObjectCache;
   V(int, last_console_context_id, 0)                                          \
   V(v8_inspector::V8Inspector*, inspector, nullptr)                           \
   V(bool, next_v8_call_is_safe_for_termination, false)                        \
-  V(bool, only_terminate_in_safe_scope, false)                                \
-  V(bool, detailed_source_positions_for_profiling, FLAG_detailed_line_info)
+  V(bool, only_terminate_in_safe_scope, false)
 
 #define THREAD_LOCAL_TOP_ACCESSOR(type, name)                        \
   inline void set_##name(type v) { thread_local_top_.name##_ = v; }  \

diff --git a/deps/v8/test/cctest/test-cpu-profiler.cc b/deps/v8/test/cctest/test-cpu-profiler.cc
@@ -40,7 +40,6 @@
 #include "src/objects-inl.h"
 #include "src/profiler/cpu-profiler-inl.h"
 #include "src/profiler/profiler-listener.h"
-#include "src/source-position-table.h"
 #include "src/utils.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/profiler-extension.h"
@@ -2545,46 +2544,6 @@ TEST(MultipleProfilers) {
   profiler2->StopProfiling("2");
 }
 
-UNINITIALIZED_TEST(DetailedSourcePositionAPI) {
-  i::FLAG_detailed_line_info = false;
-  i::FLAG_allow_natives_syntax = true;
-  v8::Isolate::CreateParams create_params;
-  create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
-  v8::Isolate* isolate = v8::Isolate::New(create_params);
-
-  const char* source =
-      "function fib(i) {"
-      "  if (i <= 1) return 1; "
-      "  return fib(i - 1) +"
-      "         fib(i - 2);"
-      "}"
-      "fib(5);"
-      "%OptimizeFunctionOnNextCall(fib);"
-      "fib(5);"
-      "fib";
-  {
-    v8::Isolate::Scope isolate_scope(isolate);
-    v8::HandleScope handle_scope(isolate);
-    v8::Local<v8::Context> context = v8::Context::New(isolate);
-    v8::Context::Scope context_scope(context);
-    i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
-
-    CHECK(!i_isolate->NeedsDetailedOptimizedCodeLineInfo());
-
-    int non_detailed_positions = GetSourcePositionEntryCount(i_isolate, source);
-
-    v8::CpuProfiler::UseDetailedSourcePositionsForProfiling(isolate);
-    CHECK(i_isolate->NeedsDetailedOptimizedCodeLineInfo());
-
-    int detailed_positions = GetSourcePositionEntryCount(i_isolate, source);
-
-    CHECK((non_detailed_positions == -1 && detailed_positions == -1) ||
-          non_detailed_positions < detailed_positions);
-  }
-
-  isolate->Dispose();
-}
-
 }  // namespace test_cpu_profiler
 }  // namespace internal
 }  // namespace v8
diff --git a/src/node.cc b/src/node.cc
@@ -2608,7 +2608,6 @@ Isolate* NewIsolate(ArrayBufferAllocator* allocator, uv_loop_t* event_loop) {
   isolate->SetMicrotasksPolicy(MicrotasksPolicy::kExplicit);
   isolate->SetFatalErrorHandler(OnFatalError);
   isolate->SetAllowWasmCodeGenerationCallback(AllowWasmCodeGenerationCallback);
-  v8::CpuProfiler::UseDetailedSourcePositionsForProfiling(isolate);
 
   return isolate;
 }