[logger] Untangle log.h includes

psmarshall · Commit Bot · commit decfb42aeb12 · 2019-01-22T10:56:52.000Z
Everything was including log.h through heap-inl.h, so remove that include by moving the one user into heap.cc, and then fix all the include errors. This reduces the log.h include ball from ~550 to ~100. Change-Id: I6d09bc2f365b48645fcfdc695a68ea12539a745d Reviewed-on: https://chromium-review.googlesource.com/c/1424198 Commit-Queue: Georg Neis <neis@chromium.org> Reviewed-by: Georg Neis <neis@chromium.org> Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> Cr-Commit-Position: refs/heads/master@{#58981}
diff --git a/src/arm/simulator-arm.cc b/src/arm/simulator-arm.cc
@@ -17,6 +17,7 @@
 #include "src/disasm.h"
 #include "src/macro-assembler.h"
 #include "src/objects-inl.h"
+#include "src/ostreams.h"
 #include "src/runtime/runtime-utils.h"
 
 // Only build the simulator if not compiling for real ARM hardware.
diff --git a/src/builtins/builtins-console.cc b/src/builtins/builtins-console.cc
@@ -7,6 +7,7 @@
 #include "src/builtins/builtins.h"
 #include "src/counters.h"
 #include "src/debug/interface-types.h"
+#include "src/log.h"
 #include "src/objects-inl.h"
 
 namespace v8 {
diff --git a/src/builtins/builtins.cc b/src/builtins/builtins.cc
@@ -13,6 +13,7 @@
 #include "src/macro-assembler.h"
 #include "src/objects-inl.h"
 #include "src/objects/fixed-array.h"
+#include "src/ostreams.h"
 #include "src/snapshot/embedded-data.h"
 #include "src/visitors.h"
 
diff --git a/src/code-stub-assembler.cc b/src/code-stub-assembler.cc
@@ -13753,4 +13753,6 @@ void CodeStubAssembler::GotoIfInitialPrototypePropertiesModified(
 }
 
 }  // namespace internal
+// TODO(petermarshall): Remove. This is a workaround for crbug.com/v8/8719
+namespace {}  // namespace
 }  // namespace v8
diff --git a/src/compilation-cache.cc b/src/compilation-cache.cc
@@ -7,6 +7,7 @@
 #include "src/counters.h"
 #include "src/globals.h"
 #include "src/heap/factory.h"
+#include "src/log.h"
 #include "src/objects-inl.h"
 #include "src/objects/compilation-cache-inl.h"
 #include "src/objects/slots.h"
diff --git a/src/compiler-dispatcher/optimizing-compile-dispatcher.cc b/src/compiler-dispatcher/optimizing-compile-dispatcher.cc
@@ -10,6 +10,7 @@
 #include "src/compiler.h"
 #include "src/counters.h"
 #include "src/isolate.h"
+#include "src/log.h"
 #include "src/objects-inl.h"
 #include "src/optimized-compilation-info.h"
 #include "src/tracing/trace-event.h"
diff --git a/src/compiler/backend/code-generator.cc b/src/compiler/backend/code-generator.cc
@@ -14,6 +14,7 @@
 #include "src/counters.h"
 #include "src/eh-frame.h"
 #include "src/frames.h"
+#include "src/log.h"
 #include "src/macro-assembler-inl.h"
 #include "src/objects/smi.h"
 #include "src/optimized-compilation-info.h"
diff --git a/src/compiler/bytecode-analysis.cc b/src/compiler/bytecode-analysis.cc
@@ -7,6 +7,7 @@
 #include "src/interpreter/bytecode-array-iterator.h"
 #include "src/interpreter/bytecode-array-random-iterator.h"
 #include "src/objects-inl.h"
+#include "src/ostreams.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/debug/debug-scopes.cc b/src/debug/debug-scopes.cc
@@ -14,6 +14,7 @@
 #include "src/isolate-inl.h"
 #include "src/objects/js-generator-inl.h"
 #include "src/objects/module.h"
+#include "src/ostreams.h"
 #include "src/parsing/parse-info.h"
 #include "src/parsing/parsing.h"
 #include "src/parsing/rewriter.h"
diff --git a/src/debug/liveedit.cc b/src/debug/liveedit.cc
@@ -14,6 +14,7 @@
 #include "src/debug/debug.h"
 #include "src/frames-inl.h"
 #include "src/isolate-inl.h"
+#include "src/log.h"
 #include "src/objects-inl.h"
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/js-generator-inl.h"
diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
@@ -15,6 +15,7 @@
 #include "src/frames-inl.h"
 #include "src/global-handles.h"
 #include "src/interpreter/interpreter.h"
+#include "src/log.h"
 #include "src/macro-assembler.h"
 #include "src/objects/debug-objects-inl.h"
 #include "src/objects/heap-number-inl.h"
diff --git a/src/external-reference.cc b/src/external-reference.cc
@@ -17,6 +17,7 @@
 #include "src/ic/stub-cache.h"
 #include "src/interpreter/interpreter.h"
 #include "src/isolate.h"
+#include "src/log.h"
 #include "src/math-random.h"
 #include "src/microtask-queue.h"
 #include "src/objects-inl.h"
diff --git a/src/heap/factory.cc b/src/heap/factory.cc
@@ -17,6 +17,7 @@
 #include "src/heap/mark-compact-inl.h"
 #include "src/interpreter/interpreter.h"
 #include "src/isolate-inl.h"
+#include "src/log.h"
 #include "src/objects/api-callbacks.h"
 #include "src/objects/arguments-inl.h"
 #include "src/objects/bigint.h"
diff --git a/src/heap/heap-inl.h b/src/heap/heap-inl.h
@@ -22,7 +22,6 @@
 #include "src/heap/spaces-inl.h"
 #include "src/isolate-data.h"
 #include "src/isolate.h"
-#include "src/log.h"
 #include "src/msan.h"
 #include "src/objects-inl.h"
 #include "src/objects/allocation-site-inl.h"
@@ -267,38 +266,6 @@ void Heap::OnAllocationEvent(HeapObject object, int size_in_bytes) {
   }
 }
 
-void Heap::OnMoveEvent(HeapObject target, HeapObject source,
-                       int size_in_bytes) {
-  HeapProfiler* heap_profiler = isolate_->heap_profiler();
-  if (heap_profiler->is_tracking_object_moves()) {
-    heap_profiler->ObjectMoveEvent(source->address(), target->address(),
-                                   size_in_bytes);
-  }
-  for (auto& tracker : allocation_trackers_) {
-    tracker->MoveEvent(source->address(), target->address(), size_in_bytes);
-  }
-  if (target->IsSharedFunctionInfo()) {
-    LOG_CODE_EVENT(isolate_, SharedFunctionInfoMoveEvent(source->address(),
-                                                         target->address()));
-  }
-
-  if (FLAG_verify_predictable) {
-    ++allocations_count_;
-    // Advance synthetic time by making a time request.
-    MonotonicallyIncreasingTimeInMs();
-
-    UpdateAllocationsHash(source);
-    UpdateAllocationsHash(target);
-    UpdateAllocationsHash(size_in_bytes);
-
-    if (allocations_count_ % FLAG_dump_allocations_digest_at_alloc == 0) {
-      PrintAllocationsHash();
-    }
-  } else if (FLAG_fuzzer_gc_analysis) {
-    ++allocations_count_;
-  }
-}
-
 bool Heap::CanAllocateInReadOnlySpace() {
   return !deserialization_complete_ &&
          (isolate()->serializer_enabled() ||
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
@@ -45,6 +45,7 @@
 #include "src/heap/stress-scavenge-observer.h"
 #include "src/heap/sweeper.h"
 #include "src/interpreter/interpreter.h"
+#include "src/log.h"
 #include "src/microtask-queue.h"
 #include "src/objects/data-handler.h"
 #include "src/objects/free-space-inl.h"
@@ -2536,6 +2537,38 @@ bool MayContainRecordedSlots(HeapObject object) {
 }
 }  // namespace
 
+void Heap::OnMoveEvent(HeapObject target, HeapObject source,
+                       int size_in_bytes) {
+  HeapProfiler* heap_profiler = isolate_->heap_profiler();
+  if (heap_profiler->is_tracking_object_moves()) {
+    heap_profiler->ObjectMoveEvent(source->address(), target->address(),
+                                   size_in_bytes);
+  }
+  for (auto& tracker : allocation_trackers_) {
+    tracker->MoveEvent(source->address(), target->address(), size_in_bytes);
+  }
+  if (target->IsSharedFunctionInfo()) {
+    LOG_CODE_EVENT(isolate_, SharedFunctionInfoMoveEvent(source->address(),
+                                                         target->address()));
+  }
+
+  if (FLAG_verify_predictable) {
+    ++allocations_count_;
+    // Advance synthetic time by making a time request.
+    MonotonicallyIncreasingTimeInMs();
+
+    UpdateAllocationsHash(source);
+    UpdateAllocationsHash(target);
+    UpdateAllocationsHash(size_in_bytes);
+
+    if (allocations_count_ % FLAG_dump_allocations_digest_at_alloc == 0) {
+      PrintAllocationsHash();
+    }
+  } else if (FLAG_fuzzer_gc_analysis) {
+    ++allocations_count_;
+  }
+}
+
 FixedArrayBase Heap::LeftTrimFixedArray(FixedArrayBase object,
                                         int elements_to_trim) {
   if (elements_to_trim == 0) {
diff --git a/src/heap/heap.h b/src/heap/heap.h
@@ -540,8 +540,7 @@ class Heap {
   inline void OnAllocationEvent(HeapObject object, int size_in_bytes);
 
   // This event is triggered after object is moved to a new place.
-  inline void OnMoveEvent(HeapObject target, HeapObject source,
-                          int size_in_bytes);
+  void OnMoveEvent(HeapObject target, HeapObject source, int size_in_bytes);
 
   inline bool CanAllocateInReadOnlySpace();
   bool deserialization_complete() const { return deserialization_complete_; }
diff --git a/src/heap/object-stats.cc b/src/heap/object-stats.cc
@@ -22,6 +22,7 @@
 #include "src/objects/literal-objects-inl.h"
 #include "src/objects/slots.h"
 #include "src/objects/templates.h"
+#include "src/ostreams.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/interpreter/interpreter-generator.cc b/src/interpreter/interpreter-generator.cc
@@ -25,6 +25,7 @@
 #include "src/objects/js-generator.h"
 #include "src/objects/module.h"
 #include "src/objects/oddball.h"
+#include "src/ostreams.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/objects/module.cc b/src/objects/module.cc
@@ -15,6 +15,7 @@
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/js-generator-inl.h"
 #include "src/objects/module-inl.h"
+#include "src/ostreams.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/parsing/parse-info.cc b/src/parsing/parse-info.cc
@@ -11,6 +11,7 @@
 #include "src/compiler-dispatcher/compiler-dispatcher.h"
 #include "src/counters.h"
 #include "src/heap/heap-inl.h"
+#include "src/log.h"
 #include "src/objects-inl.h"
 #include "src/objects/scope-info.h"
 #include "src/zone/zone.h"
diff --git a/src/runtime/runtime-classes.cc b/src/runtime/runtime-classes.cc
@@ -13,6 +13,7 @@
 #include "src/debug/debug.h"
 #include "src/elements.h"
 #include "src/isolate-inl.h"
+#include "src/log.h"
 #include "src/message-template.h"
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/literal-objects-inl.h"
diff --git a/src/runtime/runtime-test.cc b/src/runtime/runtime-test.cc
@@ -19,6 +19,7 @@
 #include "src/isolate-inl.h"
 #include "src/objects/heap-object-inl.h"
 #include "src/objects/smi.h"
+#include "src/ostreams.h"
 #include "src/runtime-profiler.h"
 #include "src/snapshot/natives.h"
 #include "src/trap-handler/trap-handler.h"
diff --git a/src/wasm/baseline/liftoff-assembler.cc b/src/wasm/baseline/liftoff-assembler.cc
@@ -7,9 +7,11 @@
 #include <sstream>
 
 #include "src/assembler-inl.h"
+#include "src/base/optional.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/wasm-compiler.h"
 #include "src/macro-assembler-inl.h"
+#include "src/ostreams.h"
 #include "src/wasm/function-body-decoder-impl.h"
 #include "src/wasm/wasm-linkage.h"
 #include "src/wasm/wasm-opcodes.h"
diff --git a/src/wasm/baseline/liftoff-compiler.cc b/src/wasm/baseline/liftoff-compiler.cc
@@ -11,6 +11,7 @@
 #include "src/compiler/wasm-compiler.h"
 #include "src/counters.h"
 #include "src/interface-descriptors.h"
+#include "src/log.h"
 #include "src/macro-assembler-inl.h"
 #include "src/objects/smi.h"
 #include "src/tracing/trace-event.h"
diff --git a/src/wasm/module-compiler.cc b/src/wasm/module-compiler.cc
@@ -7,6 +7,7 @@
 #include "src/api.h"
 #include "src/asmjs/asm-js.h"
 #include "src/base/enum-set.h"
+#include "src/base/optional.h"
 #include "src/base/template-utils.h"
 #include "src/base/utils/random-number-generator.h"
 #include "src/compiler/wasm-compiler.h"
diff --git a/src/wasm/wasm-code-manager.cc b/src/wasm/wasm-code-manager.cc
@@ -12,6 +12,7 @@
 #include "src/base/platform/platform.h"
 #include "src/disassembler.h"
 #include "src/globals.h"
+#include "src/log.h"
 #include "src/macro-assembler-inl.h"
 #include "src/macro-assembler.h"
 #include "src/objects-inl.h"
diff --git a/src/wasm/wasm-engine.cc b/src/wasm/wasm-engine.cc
@@ -9,6 +9,7 @@
 #include "src/objects-inl.h"
 #include "src/objects/heap-number.h"
 #include "src/objects/js-promise.h"
+#include "src/ostreams.h"
 #include "src/wasm/function-compiler.h"
 #include "src/wasm/module-compiler.h"
 #include "src/wasm/module-decoder.h"
diff --git a/test/cctest/interpreter/bytecode-expectations-printer.cc b/test/cctest/interpreter/bytecode-expectations-printer.cc
@@ -20,6 +20,7 @@
 #include "src/objects-inl.h"
 #include "src/objects/heap-number-inl.h"
 #include "src/objects/module-inl.h"
+#include "src/ostreams.h"
 #include "src/runtime/runtime.h"
 #include "src/source-position-table.h"
 #include "test/cctest/cctest.h"
diff --git a/test/cctest/test-cpu-profiler.cc b/test/cctest/test-cpu-profiler.cc
@@ -37,6 +37,7 @@
 #include "src/base/platform/platform.h"
 #include "src/deoptimizer.h"
 #include "src/libplatform/default-platform.h"
+#include "src/log.h"
 #include "src/objects-inl.h"
 #include "src/profiler/cpu-profiler-inl.h"
 #include "src/profiler/profiler-listener.h"
diff --git a/test/cctest/test-disasm-ia32.cc b/test/cctest/test-disasm-ia32.cc
@@ -35,6 +35,7 @@
 #include "src/disassembler.h"
 #include "src/frames-inl.h"
 #include "src/macro-assembler.h"
+#include "src/ostreams.h"
 #include "test/cctest/cctest.h"
 
 namespace v8 {
diff --git a/test/cctest/test-disasm-x64.cc b/test/cctest/test-disasm-x64.cc
@@ -36,6 +36,7 @@
 #include "src/frames-inl.h"
 #include "src/macro-assembler.h"
 #include "src/objects-inl.h"
+#include "src/ostreams.h"
 #include "test/cctest/cctest.h"
 
 namespace v8 {
diff --git a/test/cctest/test-field-type-tracking.cc b/test/cctest/test-field-type-tracking.cc
@@ -22,6 +22,7 @@
 #include "src/objects/heap-number-inl.h"
 #include "src/objects/struct-inl.h"
 #include "src/optimized-compilation-info.h"
+#include "src/ostreams.h"
 #include "src/property.h"
 #include "src/transitions.h"
 
diff --git a/test/cctest/test-heap-profiler.cc b/test/cctest/test-heap-profiler.cc
@@ -37,6 +37,7 @@
 #include "src/api-inl.h"
 #include "src/assembler-inl.h"
 #include "src/base/hashmap.h"
+#include "src/base/optional.h"
 #include "src/collector.h"
 #include "src/debug/debug.h"
 #include "src/objects-inl.h"
diff --git a/test/cctest/test-macro-assembler-arm.cc b/test/cctest/test-macro-assembler-arm.cc
@@ -30,6 +30,7 @@
 #include "src/assembler-inl.h"
 #include "src/macro-assembler.h"
 #include "src/objects-inl.h"
+#include "src/ostreams.h"
 #include "src/simulator.h"
 #include "src/v8.h"
 #include "test/cctest/cctest.h"
diff --git a/test/cctest/test-profile-generator.cc b/test/cctest/test-profile-generator.cc
@@ -29,6 +29,7 @@
 
 #include "include/v8-profiler.h"
 #include "src/api-inl.h"
+#include "src/log.h"
 #include "src/objects-inl.h"
 #include "src/profiler/cpu-profiler.h"
 #include "src/profiler/profile-generator-inl.h"
diff --git a/test/fuzzer/wasm-fuzzer-common.cc b/test/fuzzer/wasm-fuzzer-common.cc
@@ -9,6 +9,7 @@
 #include "include/v8.h"
 #include "src/isolate.h"
 #include "src/objects-inl.h"
+#include "src/ostreams.h"
 #include "src/wasm/wasm-engine.h"
 #include "src/wasm/wasm-module-builder.h"
 #include "src/wasm/wasm-module.h"
diff --git a/test/unittests/heap/unmapper-unittest.cc b/test/unittests/heap/unmapper-unittest.cc
@@ -8,6 +8,7 @@
 #include "src/heap/heap-inl.h"
 #include "src/heap/spaces-inl.h"
 #include "src/isolate.h"
+#include "src/ostreams.h"
 #include "test/unittests/test-utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

Original file line number	Diff line number	Diff line change
`@@ -13753,4 +13753,6 @@ void CodeStubAssembler::GotoIfInitialPrototypePropertiesModified(`
`13753`	`13753`	`}`
`13754`	`13754`
`13755`	`13755`	`} // namespace internal`
	`13756`	`+// TODO(petermarshall): Remove. This is a workaround for crbug.com/v8/8719`
	`13757`	`+namespace {} // namespace`
`13756`	`13758`	`} // namespace v8`