[cpu-profiler] Separate the flags for generating extra line information

psmarshall · Commit Bot · commit 30ff6719db44 · 2018-08-20T14:28:54.000Z
NeedsSourcePositionsForProfiling is used to control the generation of the line end table during parsing (see ParseInfo::CreateScript). This is costly both for memory and performance. Turning on detailed_line_info by default caused regressions because we always generate the line end table. This CL splits the two conditions apart as they aren't related. Bug: chromium:875677 Change-Id: I71006db586e504b4cf9232081ba249f5647f5b76 Reviewed-on: https://chromium-review.googlesource.com/1181041 Reviewed-by: Tobias Tebbi <tebbi@chromium.org> Commit-Queue: Peter Marshall <petermarshall@chromium.org> Cr-Commit-Position: refs/heads/master@{#55222}
diff --git a/src/isolate.cc b/src/isolate.cc
@@ -3248,11 +3248,14 @@ 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() ||
-         debug_->is_active() || logger_->is_logging() || FLAG_trace_maps ||
-         FLAG_detailed_line_info;
+         debug_->is_active() || logger_->is_logging() || FLAG_trace_maps;
 }
 
 void Isolate::SetFeedbackVectorsForProfilingTools(Object* value) {
diff --git a/src/isolate.h b/src/isolate.h
@@ -1141,6 +1141,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/src/optimized-compilation-info.cc b/src/optimized-compilation-info.cc
@@ -36,7 +36,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
`@@ -1141,6 +1141,8 @@ class Isolate : private HiddenFactory {`
`1141`	`1141`
`1142`	`1142`	`bool NeedsSourcePositionsForProfiling() const;`
`1143`	`1143`
	`1144`	`+ bool NeedsDetailedOptimizedCodeLineInfo() const;`
	`1145`	`+`
`1144`	`1146`	`bool is_best_effort_code_coverage() const {`
`1145`	`1147`	`return code_coverage_mode() == debug::Coverage::kBestEffort;`
`1146`	`1148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ OptimizedCompilationInfo::OptimizedCompilationInfo(`
`36`	`36`	`// Collect source positions for optimized code when profiling or if debugger`
`37`	`37`	`// is active, to be able to get more precise source positions at the price of`
`38`	`38`	`// more memory consumption.`
`39`		`- if (isolate->NeedsSourcePositionsForProfiling()) {`
	`39`	`+ if (isolate->NeedsDetailedOptimizedCodeLineInfo()) {`
`40`	`40`	`MarkAsSourcePositionsEnabled();`
`41`	`41`	`}`
`42`	`42`