deps: backport detailed line info for CPU profiler

psmarshall · targos · commit 63aa1f1bdd62 · 2018-09-07T17:09:54.000+02:00
[cpu-profiler] Add flag to always generate accurate line info. https://chromium.googlesource.com/v8/v8/+/ 56baf56790de439b3f69e887e94beb3b301ed77c [cpu-profiler] Turn on detailed line info for optimized code https://chromium.googlesource.com/v8/v8/+/ 84894ce6d2af7feb9e1f5574409355120887326c [cpu-profiler] Separate the flags for generating extra line information https://chromium.googlesource.com/v8/v8/+/ 30ff6719db441cc7ef220d449970cc169067e256 PR-URL: nodejs#22688 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
diff --git a/common.gypi b/common.gypi
@@ -29,7 +29,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.8',
+    'v8_embedder_string': '-node.9',
 
     # Enable disassembler for `--print-code` v8 options
     'v8_enable_disassembler': 1,
diff --git a/deps/v8/src/flag-definitions.h b/deps/v8/src/flag-definitions.h
@@ -1243,6 +1243,9 @@ DEFINE_BOOL(log_function_events, false,
 DEFINE_BOOL(prof, false,
             "Log statistical profiling information (implies --log-code).")
 
+DEFINE_BOOL(detailed_line_info, true,
+            "Always generate detailed line information for CPU profiling.")
+
 #if defined(ANDROID)
 // Phones and tablets have processors that are much slower than desktop
 // and laptop computers for which current heuristics are tuned.
diff --git a/deps/v8/src/isolate.cc b/deps/v8/src/isolate.cc
@@ -3247,6 +3247,10 @@ bool Isolate::use_optimizer() {
          !is_precise_count_code_coverage() && !is_block_count_code_coverage();
 }
 
+bool Isolate::NeedsDetailedOptimizedCodeLineInfo() const {
+  return NeedsSourcePositionsForProfiling() || FLAG_detailed_line_info;
+}
+
 bool Isolate::NeedsSourcePositionsForProfiling() const {
   return FLAG_trace_deopt || FLAG_trace_turbo || FLAG_trace_turbo_graph ||
          FLAG_turbo_profiling || FLAG_perf_prof || is_profiling() ||
diff --git a/deps/v8/src/isolate.h b/deps/v8/src/isolate.h
@@ -1044,6 +1044,8 @@ class Isolate : private HiddenFactory {
 
   bool NeedsSourcePositionsForProfiling() const;
 
+  bool NeedsDetailedOptimizedCodeLineInfo() const;
+
   bool is_best_effort_code_coverage() const {
     return code_coverage_mode() == debug::Coverage::kBestEffort;
   }
diff --git a/deps/v8/src/optimized-compilation-info.cc b/deps/v8/src/optimized-compilation-info.cc
@@ -38,7 +38,7 @@ OptimizedCompilationInfo::OptimizedCompilationInfo(
   // Collect source positions for optimized code when profiling or if debugger
   // is active, to be able to get more precise source positions at the price of
   // more memory consumption.
-  if (isolate->NeedsSourcePositionsForProfiling()) {
+  if (isolate->NeedsDetailedOptimizedCodeLineInfo()) {
     MarkAsSourcePositionsEnabled();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1044,6 +1044,8 @@ class Isolate : private HiddenFactory {`
`1044`	`1044`
`1045`	`1045`	`bool NeedsSourcePositionsForProfiling() const;`
`1046`	`1046`
	`1047`	`+ bool NeedsDetailedOptimizedCodeLineInfo() const;`
	`1048`	`+`
`1047`	`1049`	`bool is_best_effort_code_coverage() const {`
`1048`	`1050`	`return code_coverage_mode() == debug::Coverage::kBestEffort;`
`1049`	`1051`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ OptimizedCompilationInfo::OptimizedCompilationInfo(`
`38`	`38`	`// Collect source positions for optimized code when profiling or if debugger`
`39`	`39`	`// is active, to be able to get more precise source positions at the price of`
`40`	`40`	`// more memory consumption.`
`41`		`- if (isolate->NeedsSourcePositionsForProfiling()) {`
	`41`	`+ if (isolate->NeedsDetailedOptimizedCodeLineInfo()) {`
`42`	`42`	`MarkAsSourcePositionsEnabled();`
`43`	`43`	`}`
`44`	`44`