summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorRefael Ackermann <refack@gmail.com>2018-11-16 09:40:40 -0500
committerRefael Ackermann <refack@gmail.com>2018-11-17 11:32:11 -0500
commit6adbe9a9a0ad014b470507de400332075e733b10 (patch)
tree291f72c31e61011393c830717e4a6e5a62a80be7 /deps
parent344a46ad03e8e9808df8b3cc99b6b4f39dec3ef8 (diff)
downloadandroid-node-v8-6adbe9a9a0ad014b470507de400332075e733b10.tar.gz
android-node-v8-6adbe9a9a0ad014b470507de400332075e733b10.tar.bz2
android-node-v8-6adbe9a9a0ad014b470507de400332075e733b10.zip
Revert "src: enable detailed source positions in V8"
This reverts commit e2a8e3221b2580c44579c738c12d00fb37298f4a. This reverts commit 715bbb9d04a320b4c1a234e1f9d878c116beb3f4. PR-URL: https://github.com/nodejs/node/pull/24394 Fixes: https://github.com/nodejs/node/issues/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>
Diffstat (limited to 'deps')
-rw-r--r--deps/v8/include/v8-profiler.h6
-rw-r--r--deps/v8/src/api.cc5
-rw-r--r--deps/v8/src/isolate.cc3
-rw-r--r--deps/v8/src/isolate.h3
-rw-r--r--deps/v8/test/cctest/test-cpu-profiler.cc41
5 files changed, 2 insertions, 56 deletions
diff --git a/deps/v8/include/v8-profiler.h b/deps/v8/include/v8-profiler.h
index 3689a12272..9981061a44 100644
--- 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
index 8f8aaf7bc6..c1afe8d93b 100644
--- 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
index eed52d9c19..89fecce804 100644
--- 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
index efd479c41e..e199a93ec4 100644
--- 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
index 8510996079..75af3f6d98 100644
--- 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