[iwyu] Include heap-inl.h less.

- Remove heap-inl.h includes from places where it looked unnecessary. (This is a
  non-scientific approach, because it's probably pulled in indirectly anyway.)

- Annotate places which include heap-inl.h because they need heap/ internals.

- ACCESSORS legitimately needs heap-inl.h because of Heap::FromWritableHeapObject.

- Add includes to heap/heap-write-barrier(-inl).h

- A bunch of IWYU fixes discovered when working on this CL (includes which were
  missing because heap-inl.h pulls them in indirectly).

BUG=v8:7490,v8:8238,v8:8499

Change-Id: I00f9a74d430f13d7c080dca77a92b03bcca7ef96
Reviewed-on: https://chromium-review.googlesource.com/c/1349241
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Reviewed-by: Sigurd Schneider <sigurds@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Commit-Queue: Marja Hölttä <marja@chromium.org>
Cr-Commit-Position: refs/heads/master@{#57814}

src/arm/code-stubs-arm.cc

@@ -13,7 +13,6 @@
 #include "src/double.h"
 #include "src/frame-constants.h"
 #include "src/frames.h"
-#include "src/heap/heap-inl.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
 #include "src/isolate.h"

src/arm64/code-stubs-arm64.cc

@@ -12,7 +12,6 @@
 #include "src/counters.h"
 #include "src/frame-constants.h"
 #include "src/frames.h"
-#include "src/heap/heap-inl.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
 #include "src/isolate.h"

src/arm64/macro-assembler-arm64.cc

@@ -16,7 +16,6 @@
 #include "src/external-reference-table.h"
 #include "src/frame-constants.h"
 #include "src/frames-inl.h"
-#include "src/heap/heap-inl.h"
 #include "src/macro-assembler-inl.h"
 #include "src/register-configuration.h"
 #include "src/runtime/runtime.h"

src/builtins/builtins-call-gen.cc

@@ -7,7 +7,6 @@
 #include "src/builtins/builtins-utils-gen.h"
 #include "src/builtins/builtins.h"
 #include "src/globals.h"
-#include "src/heap/heap-inl.h"
 #include "src/isolate.h"
 #include "src/macro-assembler.h"
 #include "src/objects/arguments.h"

src/builtins/builtins-internal-gen.cc

@@ -6,7 +6,7 @@
 #include "src/builtins/builtins-utils-gen.h"
 #include "src/builtins/builtins.h"
 #include "src/code-stub-assembler.h"
-#include "src/heap/heap-inl.h"
+#include "src/heap/heap-inl.h"  // crbug.com/v8/8499
 #include "src/ic/accessor-assembler.h"
 #include "src/ic/keyed-store-generic.h"
 #include "src/macro-assembler.h"

src/builtins/constants-table-builder.cc

@@ -5,6 +5,8 @@
 #include "src/builtins/constants-table-builder.h"
 
 #include "src/heap/heap-inl.h"
+#include "src/isolate.h"
+#include "src/roots-inl.h"
 
 namespace v8 {
 namespace internal {

src/compiler/backend/arm/code-generator-arm.cc

@@ -11,7 +11,7 @@
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
 #include "src/double.h"
-#include "src/heap/heap-inl.h"
+#include "src/heap/heap-inl.h"  // crbug.com/v8/8499
 #include "src/macro-assembler.h"
 #include "src/optimized-compilation-info.h"
 #include "src/wasm/wasm-code-manager.h"

src/compiler/backend/arm64/code-generator-arm64.cc

@@ -11,7 +11,7 @@
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
 #include "src/frame-constants.h"
-#include "src/heap/heap-inl.h"
+#include "src/heap/heap-inl.h"  // crbug.com/v8/8499
 #include "src/optimized-compilation-info.h"
 #include "src/wasm/wasm-code-manager.h"
 #include "src/wasm/wasm-objects.h"

src/compiler/backend/ia32/code-generator-ia32.cc

@@ -12,7 +12,7 @@
 #include "src/compiler/osr.h"
 #include "src/frame-constants.h"
 #include "src/frames.h"
-#include "src/heap/heap-inl.h"
+#include "src/heap/heap-inl.h"  // crbug.com/v8/8499
 #include "src/ia32/assembler-ia32.h"
 #include "src/macro-assembler.h"
 #include "src/objects/smi.h"

src/compiler/backend/mips/code-generator-mips.cc

@@ -9,7 +9,7 @@
 #include "src/compiler/backend/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
-#include "src/heap/heap-inl.h"
+#include "src/heap/heap-inl.h"  // crbug.com/v8/8499
 #include "src/macro-assembler.h"
 #include "src/optimized-compilation-info.h"
 #include "src/wasm/wasm-code-manager.h"

src/compiler/backend/mips64/code-generator-mips64.cc

@@ -9,7 +9,7 @@
 #include "src/compiler/backend/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
-#include "src/heap/heap-inl.h"
+#include "src/heap/heap-inl.h"  // crbug.com/v8/8499
 #include "src/macro-assembler.h"
 #include "src/mips64/constants-mips64.h"
 #include "src/optimized-compilation-info.h"

src/compiler/backend/x64/code-generator-x64.cc

@@ -10,7 +10,7 @@
 #include "src/compiler/backend/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
-#include "src/heap/heap-inl.h"
+#include "src/heap/heap-inl.h"  // crbug.com/v8/8499
 #include "src/macro-assembler.h"
 #include "src/objects/smi.h"
 #include "src/optimized-compilation-info.h"

src/extensions/statistics-extension.cc

@@ -5,7 +5,7 @@
 #include "src/extensions/statistics-extension.h"
 
 #include "src/counters.h"
-#include "src/heap/heap-inl.h"
+#include "src/heap/heap-inl.h"  // crbug.com/v8/8499
 #include "src/isolate.h"
 
 namespace v8 {

src/feedback-vector-inl.h

@@ -9,6 +9,7 @@
 #include "src/globals.h"
 #include "src/heap/factory-inl.h"
 #include "src/heap/heap-inl.h"
+#include "src/heap/heap-write-barrier.h"
 #include "src/objects/maybe-object-inl.h"
 #include "src/objects/shared-function-info.h"
 #include "src/objects/smi.h"

src/heap/array-buffer-collector.cc

@@ -5,6 +5,7 @@
 #include "src/heap/array-buffer-collector.h"
 
 #include "src/base/template-utils.h"
+#include "src/cancelable-task.h"
 #include "src/heap/array-buffer-tracker.h"
 #include "src/heap/gc-tracer.h"
 #include "src/heap/heap-inl.h"

src/heap/gc-tracer.cc

@@ -9,6 +9,8 @@
 #include "src/base/atomic-utils.h"
 #include "src/counters-inl.h"
 #include "src/heap/heap-inl.h"
+#include "src/heap/incremental-marking.h"
+#include "src/heap/spaces.h"
 #include "src/isolate.h"
 
 namespace v8 {

src/heap/memory-reducer.cc

@@ -7,6 +7,7 @@
 #include "src/flags.h"
 #include "src/heap/gc-tracer.h"
 #include "src/heap/heap-inl.h"
+#include "src/heap/incremental-marking.h"
 #include "src/utils.h"
 #include "src/v8.h"
 

src/heap/scavenge-job.cc

@@ -8,6 +8,7 @@
 #include "src/heap/gc-tracer.h"
 #include "src/heap/heap-inl.h"
 #include "src/heap/heap.h"
+#include "src/heap/spaces.h"
 #include "src/isolate.h"
 #include "src/v8.h"
 #include "src/vm-state-inl.h"

src/ia32/code-stubs-ia32.cc

@@ -11,7 +11,6 @@
 #include "src/code-stubs.h"
 #include "src/frame-constants.h"
 #include "src/frames.h"
-#include "src/heap/heap-inl.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
 #include "src/isolate.h"

src/identity-map.cc

@@ -5,7 +5,8 @@
 #include "src/identity-map.h"
 
 #include "src/base/functional.h"
-#include "src/heap/heap-inl.h"
+#include "src/heap/heap.h"
+#include "src/roots-inl.h"
 
 namespace v8 {
 namespace internal {

src/json-stringifier.cc

@@ -5,7 +5,6 @@
 #include "src/json-stringifier.h"
 
 #include "src/conversions.h"
-#include "src/heap/heap-inl.h"
 #include "src/lookup.h"
 #include "src/message-template.h"
 #include "src/objects-inl.h"

src/mips/code-stubs-mips.cc

@@ -10,7 +10,6 @@
 #include "src/code-stubs.h"
 #include "src/frame-constants.h"
 #include "src/frames.h"
-#include "src/heap/heap-inl.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
 #include "src/isolate.h"

src/mips64/code-stubs-mips64.cc

@@ -9,7 +9,6 @@
 #include "src/code-stubs.h"
 #include "src/frame-constants.h"
 #include "src/frames.h"
-#include "src/heap/heap-inl.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
 #include "src/isolate.h"

src/objects-inl.h

@@ -24,6 +24,7 @@
 #include "src/field-index-inl.h"
 #include "src/handles-inl.h"
 #include "src/heap/factory.h"
+#include "src/heap/heap-inl.h"  // crbug.com/v8/8499
 #include "src/isolate-inl.h"
 #include "src/keys.h"
 #include "src/layout-descriptor-inl.h"

src/objects/api-callbacks-inl.h

@@ -8,6 +8,7 @@
 #include "src/objects/api-callbacks.h"
 
 #include "src/heap/heap-inl.h"
+#include "src/heap/heap-write-barrier.h"
 #include "src/objects/name.h"
 #include "src/objects/templates.h"
 

src/objects/debug-objects-inl.h

@@ -6,9 +6,11 @@
 #define V8_OBJECTS_DEBUG_OBJECTS_INL_H_
 
 #include "src/objects/debug-objects.h"
-#include "src/objects/shared-function-info.h"
 
 #include "src/heap/heap-inl.h"
+#include "src/heap/heap-write-barrier.h"
+#include "src/objects-inl.h"
+#include "src/objects/shared-function-info.h"
 
 // Has to be the last include (doesn't have include guards):
 #include "src/objects/object-macros.h"

src/objects/debug-objects.cc

@@ -3,8 +3,11 @@
 // found in the LICENSE file.
 
 #include "src/objects/debug-objects.h"
+
 #include "src/debug/debug-evaluate.h"
+#include "src/handles-inl.h"
 #include "src/objects/debug-objects-inl.h"
+#include "src/ostreams.h"
 
 namespace v8 {
 namespace internal {

src/objects/map-inl.h

@@ -6,7 +6,10 @@
 #define V8_OBJECTS_MAP_INL_H_
 
 #include "src/objects/map.h"
+
 #include "src/field-type.h"
+#include "src/heap/heap-inl.h"
+#include "src/layout-descriptor-inl.h"
 #include "src/objects-inl.h"
 #include "src/objects/api-callbacks-inl.h"
 #include "src/objects/descriptor-array.h"
@@ -16,10 +19,6 @@
 #include "src/property.h"
 #include "src/transitions.h"
 
-// For pulling in heap/incremental-marking.h which is needed by
-// ACCESSORS_CHECKED.
-#include "src/heap/heap-inl.h"
-
 // Has to be the last include (doesn't have include guards):
 #include "src/objects/object-macros.h"
 

src/objects/name-inl.h

@@ -8,6 +8,8 @@
 #include "src/objects/name.h"
 
 #include "src/heap/heap-inl.h"
+#include "src/heap/heap-write-barrier.h"
+#include "src/objects/map-inl.h"
 
 // Has to be the last include (doesn't have include guards):
 #include "src/objects/object-macros.h"

src/objects/scope-info.cc

@@ -9,7 +9,7 @@
 #include "src/ast/scopes.h"
 #include "src/ast/variables.h"
 #include "src/bootstrapper.h"
-#include "src/heap/heap-inl.h"
+
 #include "src/objects-inl.h"
 #include "src/objects/module-inl.h"
 

src/objects/shared-function-info-inl.h

@@ -7,6 +7,7 @@
 
 #include "src/objects/shared-function-info.h"
 
+#include "src/feedback-vector-inl.h"
 #include "src/handles-inl.h"
 #include "src/heap/heap-inl.h"
 #include "src/objects/debug-objects-inl.h"

src/roots-inl.h

@@ -7,8 +7,14 @@
 
 #include "src/roots.h"
 
+#include "src/feedback-vector.h"
 #include "src/handles.h"
 #include "src/heap/heap-inl.h"
+#include "src/objects/api-callbacks.h"
+#include "src/objects/descriptor-array.h"
+#include "src/objects/literal-objects.h"
+#include "src/objects/map.h"
+#include "src/objects/scope-info.h"
 #include "src/objects/slots.h"
 
 namespace v8 {

src/snapshot/deserializer-allocator.cc

@@ -4,7 +4,7 @@
 
 #include "src/snapshot/deserializer-allocator.h"
 
-#include "src/heap/heap-inl.h"
+#include "src/heap/heap-inl.h"  // crbug.com/v8/8499
 #include "src/snapshot/deserializer.h"
 #include "src/snapshot/startup-deserializer.h"
 

src/snapshot/partial-deserializer.cc

@@ -5,7 +5,6 @@
 #include "src/snapshot/partial-deserializer.h"
 
 #include "src/api-inl.h"
-#include "src/heap/heap-inl.h"
 #include "src/objects/slots.h"
 #include "src/snapshot/snapshot.h"
 

src/snapshot/read-only-deserializer.cc

@@ -5,7 +5,7 @@
 #include "src/snapshot/read-only-deserializer.h"
 
 #include "src/api.h"
-#include "src/heap/heap-inl.h"
+#include "src/heap/heap-inl.h"  // crbug.com/v8/8499
 #include "src/objects/slots.h"
 #include "src/snapshot/snapshot.h"
 #include "src/v8threads.h"

src/snapshot/serializer-allocator.cc

@@ -4,7 +4,7 @@
 
 #include "src/snapshot/serializer-allocator.h"
 
-#include "src/heap/heap-inl.h"
+#include "src/heap/heap-inl.h"  // crbug.com/v8/8499
 #include "src/snapshot/references.h"
 #include "src/snapshot/serializer.h"
 #include "src/snapshot/snapshot-source-sink.h"

src/x64/code-stubs-x64.cc

@@ -11,7 +11,6 @@
 #include "src/double.h"
 #include "src/frame-constants.h"
 #include "src/frames.h"
-#include "src/heap/heap-inl.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
 #include "src/isolate.h"

src/x64/macro-assembler-x64.cc

@@ -16,7 +16,6 @@
 #include "src/external-reference-table.h"
 #include "src/frames-inl.h"
 #include "src/globals.h"
-#include "src/heap/heap-inl.h"
 #include "src/macro-assembler.h"
 #include "src/objects-inl.h"
 #include "src/objects/smi.h"

test/cctest/test-decls.cc

@@ -29,8 +29,6 @@
 
 #include "src/v8.h"
 
-#include "src/heap/heap-inl.h"
-#include "src/heap/heap.h"
 #include "test/cctest/cctest.h"
 
 namespace v8 {