Remove some unused includes (2)

Mainly src/compiler-dispatcher, src/d8, src/debug, src/runtime.
Drive-by: Restore CONDITIONAL_WRITE_BARRIER invocation, which was
accidentally changed.

Bug: v8:13006
Change-Id: If07334b654b9ba2d4bec14a11cfdeeb1aa953b7d
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3745402
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Toon Verwaest <verwaest@chromium.org>
Cr-Commit-Position: refs/heads/main@{#81556}

src/compiler-dispatcher/lazy-compile-dispatcher.cc

@@ -7,24 +7,19 @@
 #include <atomic>
 
 #include "include/v8-platform.h"
-#include "src/ast/ast.h"
 #include "src/base/platform/mutex.h"
 #include "src/base/platform/time.h"
 #include "src/codegen/compiler.h"
 #include "src/common/globals.h"
 #include "src/execution/isolate.h"
 #include "src/flags/flags.h"
-#include "src/handles/global-handles-inl.h"
 #include "src/heap/parked-scope.h"
 #include "src/logging/counters.h"
 #include "src/logging/runtime-call-stats-scope.h"
-#include "src/numbers/hash-seed-inl.h"
 #include "src/objects/instance-type.h"
 #include "src/objects/objects-inl.h"
 #include "src/parsing/parse-info.h"
-#include "src/parsing/parser.h"
-#include "src/roots/roots.h"
-#include "src/sandbox/external-pointer.h"
+#include "src/parsing/scanner.h"
 #include "src/tasks/cancelable-task.h"
 #include "src/tasks/task-utils.h"
 #include "src/zone/zone-list-inl.h"  // crbug.com/v8/8816

src/compiler-dispatcher/lazy-compile-dispatcher.h

@@ -12,14 +12,11 @@
 
 #include "src/base/atomic-utils.h"
 #include "src/base/macros.h"
-#include "src/base/optional.h"
 #include "src/base/platform/condition-variable.h"
 #include "src/base/platform/mutex.h"
 #include "src/base/platform/semaphore.h"
 #include "src/common/globals.h"
-#include "src/handles/maybe-handles.h"
 #include "src/utils/identity-map.h"
-#include "src/utils/locked-queue.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"  // nogncheck
 
 namespace v8 {

src/compiler-dispatcher/optimizing-compile-dispatcher.cc

@@ -11,7 +11,6 @@
 #include "src/execution/local-isolate.h"
 #include "src/handles/handles-inl.h"
 #include "src/heap/local-heap.h"
-#include "src/heap/parked-scope.h"
 #include "src/init/v8.h"
 #include "src/logging/counters.h"
 #include "src/logging/log.h"

src/compiler-dispatcher/optimizing-compile-dispatcher.h

@@ -10,7 +10,6 @@
 
 #include "src/base/platform/condition-variable.h"
 #include "src/base/platform/mutex.h"
-#include "src/base/platform/platform.h"
 #include "src/common/globals.h"
 #include "src/flags/flags.h"
 #include "src/utils/allocation.h"

src/d8/async-hooks-wrapper.h

@@ -6,11 +6,12 @@
 #define V8_D8_ASYNC_HOOKS_WRAPPER_H_
 
 #include <stack>
+#include <vector>
 
 #include "include/v8-function-callback.h"
 #include "include/v8-local-handle.h"
 #include "include/v8-promise.h"
-#include "src/objects/objects.h"
+#include "src/base/platform/mutex.h"
 
 namespace v8 {
 

src/d8/d8-console.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "src/d8/d8-console.h"
-#include "src/d8/d8.h"
+
 #include "src/execution/isolate.h"
 
 namespace v8 {

src/d8/d8-console.h

@@ -5,8 +5,9 @@
 #ifndef V8_D8_D8_CONSOLE_H_
 #define V8_D8_D8_CONSOLE_H_
 
+#include <map>
+
 #include "src/base/platform/time.h"
-#include "src/debug/debug-interface.h"
 #include "src/debug/interface-types.h"
 
 namespace v8 {

src/d8/d8-posix.cc

@@ -18,7 +18,6 @@
 
 #include "include/v8-container.h"
 #include "include/v8-template.h"
-#include "src/base/platform/wrappers.h"
 #include "src/d8/d8.h"
 
 namespace v8 {

src/d8/d8.h

@@ -22,9 +22,6 @@
 #include "src/base/platform/wrappers.h"
 #include "src/d8/async-hooks-wrapper.h"
 #include "src/heap/parked-scope.h"
-#include "src/strings/string-hasher.h"
-#include "src/utils/allocation.h"
-#include "src/utils/utils.h"
 
 namespace v8 {
 

src/debug/debug-coverage.cc

@@ -5,7 +5,6 @@
 #include "src/debug/debug-coverage.h"
 
 #include "src/ast/ast-source-ranges.h"
-#include "src/ast/ast.h"
 #include "src/base/hashmap.h"
 #include "src/common/assert-scope.h"
 #include "src/common/globals.h"
@@ -13,7 +12,6 @@
 #include "src/deoptimizer/deoptimizer.h"
 #include "src/execution/frames-inl.h"
 #include "src/execution/isolate.h"
-#include "src/objects/debug-objects-inl.h"
 #include "src/objects/objects.h"
 
 namespace v8 {

src/debug/debug-coverage.h

@@ -10,7 +10,6 @@
 
 #include "src/debug/debug-interface.h"
 #include "src/handles/handles.h"
-#include "src/objects/objects.h"
 
 namespace v8 {
 namespace internal {

src/debug/debug-evaluate.cc

@@ -7,6 +7,7 @@
 #include "src/builtins/accessors.h"
 #include "src/codegen/assembler-inl.h"
 #include "src/codegen/compiler.h"
+#include "src/codegen/reloc-info.h"
 #include "src/codegen/script-details.h"
 #include "src/common/globals.h"
 #include "src/debug/debug-frames.h"
@@ -18,7 +19,6 @@
 #include "src/interpreter/bytecodes.h"
 #include "src/objects/code-inl.h"
 #include "src/objects/contexts.h"
-#include "src/snapshot/snapshot.h"
 
 #if V8_ENABLE_WEBASSEMBLY
 #include "src/debug/debug-wasm-objects.h"

src/debug/debug-evaluate.h

@@ -10,8 +10,8 @@
 #include "src/base/macros.h"
 #include "src/common/globals.h"
 #include "src/debug/debug-frames.h"
+#include "src/debug/debug-interface.h"
 #include "src/debug/debug-scopes.h"
-#include "src/debug/debug.h"
 #include "src/execution/frames.h"
 #include "src/objects/objects.h"
 #include "src/objects/shared-function-info.h"

src/debug/debug-scope-iterator.cc

@@ -5,9 +5,6 @@
 #include "src/debug/debug-scope-iterator.h"
 
 #include "src/api/api-inl.h"
-#include "src/debug/debug.h"
-#include "src/debug/liveedit.h"
-#include "src/execution/frames-inl.h"
 #include "src/execution/isolate.h"
 #include "src/objects/js-generator-inl.h"
 

src/debug/debug-scopes.cc

@@ -11,13 +11,11 @@
 #include "src/common/globals.h"
 #include "src/debug/debug.h"
 #include "src/execution/frames-inl.h"
-#include "src/execution/isolate-inl.h"
 #include "src/objects/js-generator-inl.h"
 #include "src/objects/source-text-module.h"
-#include "src/objects/string-set-inl.h"
+#include "src/objects/string-set.h"
 #include "src/parsing/parse-info.h"
 #include "src/parsing/parsing.h"
-#include "src/parsing/rewriter.h"
 #include "src/utils/ostreams.h"
 
 namespace v8 {

src/debug/debug-stack-trace-iterator.cc

@@ -8,7 +8,6 @@
 #include "src/debug/debug-evaluate.h"
 #include "src/debug/debug-scope-iterator.h"
 #include "src/debug/debug.h"
-#include "src/debug/liveedit.h"
 #include "src/execution/frames-inl.h"
 #include "src/execution/isolate.h"
 

src/debug/debug-type-profile.h

@@ -10,7 +10,6 @@
 
 #include "src/debug/debug-interface.h"
 #include "src/handles/handles.h"
-#include "src/objects/objects.h"
 
 namespace v8 {
 namespace internal {

src/debug/debug.cc

@@ -8,10 +8,8 @@
 #include <unordered_set>
 
 #include "src/api/api-inl.h"
-#include "src/api/api-natives.h"
 #include "src/base/platform/mutex.h"
 #include "src/builtins/builtins.h"
-#include "src/codegen/assembler-inl.h"
 #include "src/codegen/compilation-cache.h"
 #include "src/codegen/compiler.h"
 #include "src/common/assert-scope.h"
@@ -20,7 +18,6 @@
 #include "src/debug/debug-evaluate.h"
 #include "src/debug/liveedit.h"
 #include "src/deoptimizer/deoptimizer.h"
-#include "src/execution/arguments.h"
 #include "src/execution/execution.h"
 #include "src/execution/frames-inl.h"
 #include "src/execution/isolate-inl.h"
@@ -29,7 +26,6 @@
 #include "src/heap/heap-inl.h"  // For NextDebuggingId.
 #include "src/init/bootstrapper.h"
 #include "src/interpreter/bytecode-array-iterator.h"
-#include "src/interpreter/interpreter.h"
 #include "src/logging/counters.h"
 #include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/api-callbacks-inl.h"
@@ -38,7 +34,6 @@
 #include "src/objects/js-promise-inl.h"
 #include "src/objects/slots.h"
 #include "src/snapshot/embedded/embedded-data.h"
-#include "src/snapshot/snapshot.h"
 
 #if V8_ENABLE_WEBASSEMBLY
 #include "src/wasm/wasm-debug.h"

src/debug/interface-types.h

@@ -9,7 +9,7 @@
 
 #include "include/v8-function-callback.h"
 #include "include/v8-local-handle.h"
-#include "src/common/globals.h"
+#include "src/base/macros.h"
 
 namespace v8 {
 

src/debug/liveedit.cc

@@ -16,11 +16,8 @@
 #include "src/debug/debug-stack-trace-iterator.h"
 #include "src/debug/debug.h"
 #include "src/execution/frames-inl.h"
-#include "src/execution/isolate-inl.h"
 #include "src/execution/v8threads.h"
-#include "src/init/v8.h"
 #include "src/logging/log.h"
-#include "src/objects/hash-table-inl.h"
 #include "src/objects/js-generator-inl.h"
 #include "src/objects/objects-inl.h"
 #include "src/parsing/parse-info.h"

src/debug/wasm/gdb-server/gdb-remote-util.h

@@ -7,7 +7,7 @@
 
 #include <string>
 #include <vector>
-#include "src/flags/flags.h"
+
 #include "src/utils/utils.h"
 
 namespace v8 {

src/debug/wasm/gdb-server/gdb-server-thread.cc

@@ -3,8 +3,10 @@
 // found in the LICENSE file.
 
 #include "src/debug/wasm/gdb-server/gdb-server-thread.h"
+
 #include "src/debug/wasm/gdb-server/gdb-server.h"
 #include "src/debug/wasm/gdb-server/session.h"
+#include "src/flags/flags.h"
 
 namespace v8 {
 namespace internal {

src/debug/wasm/gdb-server/target.h

@@ -7,7 +7,7 @@
 
 #include <atomic>
 #include <map>
-#include "src/base/macros.h"
+
 #include "src/debug/wasm/gdb-server/gdb-remote-util.h"
 
 namespace v8 {

src/debug/wasm/gdb-server/wasm-module-debug.cc

@@ -6,7 +6,6 @@
 
 #include "src/api/api-inl.h"
 #include "src/api/api.h"
-#include "src/base/platform/wrappers.h"
 #include "src/execution/frames-inl.h"
 #include "src/execution/frames.h"
 #include "src/objects/script.h"

src/debug/wasm/gdb-server/wasm-module-debug.h

@@ -5,7 +5,7 @@
 #ifndef V8_DEBUG_WASM_GDB_SERVER_WASM_MODULE_DEBUG_H_
 #define V8_DEBUG_WASM_GDB_SERVER_WASM_MODULE_DEBUG_H_
 
-#include "src/debug/debug.h"
+#include "src/debug/debug-interface.h"
 #include "src/debug/wasm/gdb-server/gdb-remote-util.h"
 #include "src/execution/frames.h"
 

src/logging/runtime-call-stats.cc

@@ -8,6 +8,7 @@
 
 #include <iomanip>
 
+#include "src/flags/flags.h"
 #include "src/tracing/tracing-category-observer.h"
 #include "src/utils/ostreams.h"
 

src/runtime/runtime-array.cc

@@ -2,22 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/debug/debug.h"
 #include "src/execution/arguments-inl.h"
 #include "src/execution/isolate-inl.h"
 #include "src/execution/protectors-inl.h"
 #include "src/heap/factory.h"
 #include "src/heap/heap-inl.h"  // For ToBoolean. TODO(jkummerow): Drop.
-#include "src/heap/heap-write-barrier-inl.h"
-#include "src/logging/counters.h"
-#include "src/numbers/conversions-inl.h"
 #include "src/objects/allocation-site-inl.h"
-#include "src/objects/arguments-inl.h"
 #include "src/objects/elements.h"
-#include "src/objects/hash-table-inl.h"
 #include "src/objects/js-array-inl.h"
-#include "src/objects/prototype.h"
-#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-bigint.cc

@@ -3,10 +3,8 @@
 // found in the LICENSE file.
 
 #include "src/execution/arguments-inl.h"
-#include "src/logging/counters.h"
 #include "src/objects/bigint.h"
 #include "src/objects/objects-inl.h"
-#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-classes.cc

@@ -9,19 +9,13 @@
 #include "src/builtins/accessors.h"
 #include "src/common/globals.h"
 #include "src/common/message-template.h"
-#include "src/debug/debug.h"
 #include "src/execution/arguments-inl.h"
-#include "src/execution/frames-inl.h"
 #include "src/execution/isolate-inl.h"
-#include "src/logging/counters.h"
 #include "src/logging/log.h"
-#include "src/objects/elements.h"
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/literal-objects-inl.h"
 #include "src/objects/lookup-inl.h"
 #include "src/objects/smi.h"
-#include "src/objects/struct-inl.h"
-#include "src/runtime/runtime-utils.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {

src/runtime/runtime-collections.cc

@@ -5,11 +5,8 @@
 #include "src/execution/arguments-inl.h"
 #include "src/heap/factory.h"
 #include "src/heap/heap-inl.h"  // For ToBoolean. TODO(jkummerow): Drop.
-#include "src/logging/counters.h"
-#include "src/numbers/conversions-inl.h"
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/js-collection-inl.h"
-#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-compiler.cc

@@ -3,26 +3,18 @@
 // found in the LICENSE file.
 
 #include "src/asmjs/asm-js.h"
-#include "src/baseline/baseline.h"
 #include "src/codegen/compilation-cache.h"
 #include "src/codegen/compiler.h"
-#include "src/codegen/optimized-compilation-info.h"
 #include "src/common/assert-scope.h"
 #include "src/common/globals.h"
 #include "src/common/message-template.h"
-#include "src/compiler-dispatcher/optimizing-compile-dispatcher.h"
-#include "src/compiler/pipeline.h"
 #include "src/deoptimizer/deoptimizer.h"
 #include "src/execution/arguments-inl.h"
 #include "src/execution/frames-inl.h"
 #include "src/execution/isolate-inl.h"
-#include "src/execution/v8threads.h"
-#include "src/execution/vm-state-inl.h"
-#include "src/heap/parked-scope.h"
 #include "src/objects/js-array-buffer-inl.h"
-#include "src/objects/js-array-inl.h"
+#include "src/objects/objects-inl.h"
 #include "src/objects/shared-function-info.h"
-#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-date.cc

@@ -2,14 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/date/date.h"
 #include "src/execution/arguments.h"
 #include "src/execution/isolate-inl.h"
 #include "src/heap/factory.h"
-#include "src/logging/counters.h"
-#include "src/numbers/conversions-inl.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-debug.cc

@@ -4,25 +4,16 @@
 
 #include <vector>
 
-#include "src/codegen/compiler.h"
 #include "src/common/globals.h"
 #include "src/debug/debug-coverage.h"
-#include "src/debug/debug-evaluate.h"
-#include "src/debug/debug-frames.h"
 #include "src/debug/debug-scopes.h"
 #include "src/debug/debug.h"
 #include "src/debug/liveedit.h"
-#include "src/deoptimizer/deoptimizer.h"
-#include "src/execution/arguments-inl.h"
 #include "src/execution/frames-inl.h"
 #include "src/execution/isolate-inl.h"
 #include "src/heap/heap-inl.h"  // For ToBoolean. TODO(jkummerow): Drop.
-#include "src/interpreter/bytecode-array-iterator.h"
 #include "src/interpreter/bytecodes.h"
 #include "src/interpreter/interpreter.h"
-#include "src/logging/counters.h"
-#include "src/objects/debug-objects-inl.h"
-#include "src/objects/heap-object-inl.h"
 #include "src/objects/js-array-buffer-inl.h"
 #include "src/objects/js-collection-inl.h"
 #include "src/objects/js-generator-inl.h"

src/runtime/runtime-forin.cc

@@ -2,14 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/execution/arguments-inl.h"
 #include "src/execution/isolate-inl.h"
 #include "src/heap/factory.h"
 #include "src/heap/heap-inl.h"  // For ToBoolean. TODO(jkummerow): Drop.
-#include "src/logging/counters.h"
-#include "src/objects/elements.h"
 #include "src/objects/keys.h"
 #include "src/objects/module.h"
 #include "src/objects/objects-inl.h"

src/runtime/runtime-function.cc

@@ -3,12 +3,8 @@
 // found in the LICENSE file.
 
 #include "src/builtins/accessors.h"
-#include "src/codegen/compiler.h"
-#include "src/execution/arguments-inl.h"
 #include "src/execution/isolate-inl.h"
 #include "src/heap/heap-inl.h"  // For ToBoolean. TODO(jkummerow): Drop.
-#include "src/logging/counters.h"
-#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-futex.cc

@@ -2,15 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/base/platform/time.h"
 #include "src/common/globals.h"
-#include "src/execution/arguments-inl.h"
 #include "src/execution/futex-emulation.h"
-#include "src/logging/counters.h"
 #include "src/numbers/conversions-inl.h"
-#include "src/objects/heap-object-inl.h"
 #include "src/objects/js-array-buffer-inl.h"
 
 // Implement Futex API for SharedArrayBuffers as defined in the

src/runtime/runtime-generator.cc

@@ -2,13 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/execution/arguments-inl.h"
 #include "src/heap/factory.h"
 #include "src/heap/heap-inl.h"
-#include "src/logging/counters.h"
 #include "src/objects/js-generator-inl.h"
-#include "src/objects/objects-inl.h"
-#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-internal.cc

@@ -6,28 +6,16 @@
 
 #include "src/api/api-inl.h"
 #include "src/api/api.h"
-#include "src/ast/ast-traversal-visitor.h"
-#include "src/ast/prettyprinter.h"
 #include "src/builtins/builtins.h"
 #include "src/common/message-template.h"
-#include "src/debug/debug.h"
 #include "src/execution/arguments-inl.h"
-#include "src/execution/frames-inl.h"
 #include "src/execution/isolate-inl.h"
 #include "src/execution/messages.h"
 #include "src/execution/tiering-manager.h"
 #include "src/handles/maybe-handles.h"
-#include "src/init/bootstrapper.h"
 #include "src/logging/counters.h"
 #include "src/numbers/conversions.h"
-#include "src/objects/feedback-vector-inl.h"
-#include "src/objects/js-array-inl.h"
 #include "src/objects/template-objects-inl.h"
-#include "src/parsing/parse-info.h"
-#include "src/parsing/parsing.h"
-#include "src/runtime/runtime-utils.h"
-#include "src/snapshot/snapshot.h"
-#include "src/strings/string-builder-inl.h"
 #include "src/utils/ostreams.h"
 
 #if V8_ENABLE_WEBASSEMBLY

src/runtime/runtime-intl.cc

@@ -9,25 +9,14 @@
 #include <cmath>
 #include <memory>
 
-#include "src/api/api-inl.h"
-#include "src/api/api-natives.h"
-#include "src/date/date.h"
-#include "src/execution/arguments-inl.h"
 #include "src/execution/isolate-inl.h"
-#include "src/handles/global-handles.h"
-#include "src/heap/factory.h"
-#include "src/logging/counters.h"
 #include "src/objects/intl-objects.h"
-#include "src/objects/js-array-inl.h"
 #include "src/objects/js-collator-inl.h"
 #include "src/objects/js-date-time-format-inl.h"
 #include "src/objects/js-list-format-inl.h"
 #include "src/objects/js-list-format.h"
 #include "src/objects/js-number-format-inl.h"
 #include "src/objects/js-plural-rules-inl.h"
-#include "src/objects/managed.h"
-#include "src/runtime/runtime-utils.h"
-#include "src/utils/utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-literals.cc

@@ -6,14 +6,11 @@
 #include "src/common/globals.h"
 #include "src/execution/arguments-inl.h"
 #include "src/execution/isolate-inl.h"
-#include "src/logging/counters.h"
 #include "src/objects/allocation-site-scopes-inl.h"
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/heap-number-inl.h"
-#include "src/objects/heap-object-inl.h"
 #include "src/objects/js-regexp-inl.h"
 #include "src/objects/literal-objects-inl.h"
-#include "src/runtime/runtime-utils.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {

src/runtime/runtime-module.cc

@@ -3,11 +3,8 @@
 // found in the LICENSE file.
 
 #include "src/execution/arguments-inl.h"
-#include "src/logging/counters.h"
 #include "src/objects/js-promise.h"
-#include "src/objects/objects-inl.h"
 #include "src/objects/source-text-module.h"
-#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-numbers.cc

@@ -2,13 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/base/bits.h"
 #include "src/execution/arguments-inl.h"
 #include "src/execution/isolate-inl.h"
 #include "src/heap/heap-inl.h"  // For ToBoolean. TODO(jkummerow): Drop.
-#include "src/init/bootstrapper.h"
-#include "src/logging/counters.h"
-#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-object.cc

@@ -2,29 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/ast/prettyprinter.h"
 #include "src/base/macros.h"
 #include "src/builtins/builtins.h"
 #include "src/common/globals.h"
 #include "src/common/message-template.h"
-#include "src/debug/debug.h"
 #include "src/execution/arguments-inl.h"
 #include "src/execution/frames.h"
 #include "src/execution/isolate-inl.h"
 #include "src/execution/messages.h"
 #include "src/handles/maybe-handles.h"
 #include "src/heap/heap-inl.h"  // For ToBoolean. TODO(jkummerow): Drop.
-#include "src/heap/memory-chunk.h"
-#include "src/init/bootstrapper.h"
-#include "src/logging/counters.h"
-#include "src/objects/hash-table-inl.h"
-#include "src/objects/js-array-inl.h"
 #include "src/objects/map-updater.h"
 #include "src/objects/property-descriptor-object.h"
 #include "src/objects/property-descriptor.h"
 #include "src/objects/property-details.h"
 #include "src/objects/swiss-name-dictionary-inl.h"
-#include "src/runtime/runtime-utils.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {

src/runtime/runtime-operators.cc

@@ -5,8 +5,6 @@
 #include "src/execution/arguments.h"
 #include "src/execution/isolate-inl.h"
 #include "src/heap/heap-inl.h"  // For ToBoolean. TODO(jkummerow): Drop.
-#include "src/logging/counters.h"
-#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-promise.cc

@@ -6,13 +6,7 @@
 #include "src/debug/debug.h"
 #include "src/execution/arguments-inl.h"
 #include "src/execution/microtask-queue.h"
-#include "src/logging/counters.h"
-#include "src/objects/elements.h"
-#include "src/objects/heap-object-inl.h"
 #include "src/objects/js-promise-inl.h"
-#include "src/objects/objects-inl.h"
-#include "src/objects/oddball-inl.h"
-#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-proxy.cc

@@ -2,14 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
 #include "src/execution/arguments-inl.h"
 #include "src/execution/isolate-inl.h"
 #include "src/heap/factory.h"
 #include "src/heap/heap-inl.h"  // For ToBoolean. TODO(jkummerow): Drop.
-#include "src/logging/counters.h"
-#include "src/objects/elements.h"
 #include "src/objects/objects-inl.h"
 
 namespace v8 {

src/runtime/runtime-regexp.cc

@@ -16,7 +16,6 @@
 #include "src/objects/js-regexp-inl.h"
 #include "src/regexp/regexp-utils.h"
 #include "src/regexp/regexp.h"
-#include "src/runtime/runtime-utils.h"
 #include "src/strings/string-builder-inl.h"
 #include "src/strings/string-search.h"
 

src/runtime/runtime-scopes.cc

@@ -4,7 +4,6 @@
 
 #include <memory>
 
-#include "src/ast/scopes.h"
 #include "src/builtins/accessors.h"
 #include "src/common/message-template.h"
 #include "src/deoptimizer/deoptimizer.h"
@@ -13,11 +12,7 @@
 #include "src/execution/isolate-inl.h"
 #include "src/execution/isolate.h"
 #include "src/heap/heap-inl.h"  // For ToBoolean. TODO(jkummerow): Drop.
-#include "src/init/bootstrapper.h"
-#include "src/logging/counters.h"
 #include "src/objects/arguments-inl.h"
-#include "src/objects/heap-object-inl.h"
-#include "src/objects/module-inl.h"
 #include "src/objects/smi.h"
 #include "src/runtime/runtime-utils.h"
 

src/runtime/runtime-strings.cc

@@ -4,16 +4,12 @@
 
 #include "src/execution/arguments-inl.h"
 #include "src/heap/heap-inl.h"
-#include "src/logging/counters.h"
 #include "src/numbers/conversions.h"
 #include "src/objects/js-array-inl.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/slots.h"
 #include "src/objects/smi.h"
-#include "src/regexp/regexp-utils.h"
-#include "src/runtime/runtime-utils.h"
 #include "src/strings/string-builder-inl.h"
-#include "src/strings/string-search.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-symbol.cc

@@ -5,9 +5,7 @@
 #include "src/execution/arguments-inl.h"
 #include "src/execution/isolate-inl.h"
 #include "src/heap/heap-inl.h"  // For ToBoolean. TODO(jkummerow): Drop.
-#include "src/logging/counters.h"
 #include "src/objects/objects-inl.h"
-#include "src/runtime/runtime-utils.h"
 #include "src/strings/string-builder-inl.h"
 
 namespace v8 {

src/runtime/runtime-temporal.cc

@@ -2,13 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/base/bits.h"
-#include "src/execution/arguments-inl.h"
 #include "src/execution/isolate-inl.h"
-#include "src/init/bootstrapper.h"
-#include "src/logging/counters.h"
 #include "src/objects/js-temporal-objects.h"
-#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-test-wasm.cc

@@ -8,11 +8,8 @@
 #include "src/execution/arguments-inl.h"
 #include "src/execution/frames-inl.h"
 #include "src/heap/heap-inl.h"
-#include "src/logging/counters.h"
 #include "src/objects/smi.h"
-#include "src/runtime/runtime-utils.h"
 #include "src/trap-handler/trap-handler.h"
-#include "src/utils/ostreams.h"
 #include "src/wasm/memory-tracing.h"
 #include "src/wasm/module-compiler.h"
 #include "src/wasm/wasm-code-manager.h"

src/runtime/runtime-test.cc

@@ -9,8 +9,6 @@
 #include "include/v8-profiler.h"
 #include "src/api/api-inl.h"
 #include "src/base/numbers/double.h"
-#include "src/base/platform/mutex.h"
-#include "src/codegen/assembler-inl.h"
 #include "src/codegen/compiler.h"
 #include "src/codegen/pending-optimization-table.h"
 #include "src/compiler-dispatcher/lazy-compile-dispatcher.h"
@@ -25,16 +23,11 @@
 #include "src/heap/heap-inl.h"  // For ToBoolean. TODO(jkummerow): Drop.
 #include "src/heap/heap-write-barrier-inl.h"
 #include "src/ic/stub-cache.h"
-#include "src/logging/counters.h"
-#include "src/objects/heap-object-inl.h"
-#include "src/objects/js-array-inl.h"
 #include "src/objects/js-function-inl.h"
 #include "src/objects/js-regexp-inl.h"
-#include "src/objects/managed-inl.h"
 #include "src/objects/smi.h"
 #include "src/profiler/heap-snapshot-generator.h"
 #include "src/regexp/regexp.h"
-#include "src/runtime/runtime-utils.h"
 #include "src/snapshot/snapshot.h"
 #include "src/web-snapshot/web-snapshot.h"
 

src/runtime/runtime-typedarray.cc

@@ -6,12 +6,9 @@
 #include "src/common/message-template.h"
 #include "src/execution/arguments-inl.h"
 #include "src/heap/factory.h"
-#include "src/heap/heap-inl.h"
-#include "src/logging/counters.h"
 #include "src/objects/elements.h"
 #include "src/objects/js-array-buffer-inl.h"
 #include "src/objects/objects-inl.h"
-#include "src/runtime/runtime-utils.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {

src/runtime/runtime-utils.h

@@ -5,10 +5,7 @@
 #ifndef V8_RUNTIME_RUNTIME_UTILS_H_
 #define V8_RUNTIME_RUNTIME_UTILS_H_
 
-#include "src/base/logging.h"
-#include "src/common/globals.h"
 #include "src/objects/objects.h"
-#include "src/runtime/runtime.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-wasm.cc

@@ -2,23 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/base/memory.h"
 #include "src/common/assert-scope.h"
 #include "src/common/message-template.h"
 #include "src/compiler/wasm-compiler.h"
 #include "src/debug/debug.h"
 #include "src/execution/arguments-inl.h"
-#include "src/execution/frame-constants.h"
 #include "src/execution/frames.h"
 #include "src/heap/factory.h"
-#include "src/logging/counters.h"
 #include "src/numbers/conversions.h"
 #include "src/objects/objects-inl.h"
-#include "src/runtime/runtime-utils.h"
 #include "src/strings/unicode-inl.h"
 #include "src/trap-handler/trap-handler.h"
 #include "src/wasm/module-compiler.h"
-#include "src/wasm/stacks.h"
 #include "src/wasm/value-type.h"
 #include "src/wasm/wasm-code-manager.h"
 #include "src/wasm/wasm-constants.h"

src/runtime/runtime.cc

@@ -5,14 +5,9 @@
 #include "src/runtime/runtime.h"
 
 #include "src/base/hashmap.h"
-#include "src/base/platform/wrappers.h"
-#include "src/codegen/reloc-info.h"
 #include "src/execution/isolate.h"
-#include "src/handles/handles-inl.h"
-#include "src/heap/heap.h"
-#include "src/objects/contexts.h"
-#include "src/objects/objects-inl.h"
 #include "src/runtime/runtime-utils.h"
+#include "src/strings/string-hasher-inl.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime.h

@@ -9,13 +9,10 @@
 
 #include "include/v8-maybe.h"
 #include "src/base/bit-field.h"
-#include "src/base/platform/time.h"
 #include "src/common/globals.h"
 #include "src/handles/handles.h"
-#include "src/objects/elements-kind.h"
 #include "src/strings/unicode.h"
 #include "src/utils/allocation.h"
-#include "src/zone/zone.h"
 
 namespace v8 {
 namespace internal {

src/wasm/module-compiler.h

@@ -15,6 +15,7 @@
 
 #include "include/v8-metrics.h"
 #include "src/base/optional.h"
+#include "src/base/platform/time.h"
 #include "src/common/globals.h"
 #include "src/tasks/cancelable-task.h"
 #include "src/wasm/compilation-environment.h"

src/wasm/wasm-debug.cc

@@ -10,6 +10,7 @@
 #include "src/common/assert-scope.h"
 #include "src/compiler/wasm-compiler.h"
 #include "src/debug/debug-evaluate.h"
+#include "src/debug/debug.h"
 #include "src/execution/frames-inl.h"
 #include "src/heap/factory.h"
 #include "src/wasm/baseline/liftoff-compiler.h"

src/wasm/wasm-objects.cc

@@ -10,7 +10,6 @@
 #include "src/debug/debug.h"
 #include "src/logging/counters.h"
 #include "src/objects/managed-inl.h"
-#include "src/objects/object-macros.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/shared-function-info.h"
 #include "src/utils/utils.h"
@@ -28,6 +27,9 @@
 #include "src/wasm/wasm-subtyping.h"
 #include "src/wasm/wasm-value.h"
 
+// Needs to be last so macros do not get undefined.
+#include "src/objects/object-macros.h"
+
 #define TRACE_IFT(...)              \
   do {                              \
     if (false) PrintF(__VA_ARGS__); \
@@ -1608,8 +1610,7 @@ void WasmArray::SetTaggedElement(uint32_t index, Handle<Object> value,
                                  WriteBarrierMode mode) {
   DCHECK(type()->element_type().is_reference());
   TaggedField<Object>::store(*this, element_offset(index), *value);
-  CombinedWriteBarrier(*this, this->RawField(element_offset(index)), *value,
-                       mode);
+  CONDITIONAL_WRITE_BARRIER(*this, element_offset(index), *value, mode);
 }
 
 // static
@@ -2439,4 +2440,5 @@ bool TypecheckJSObject(Isolate* isolate, const WasmModule* module,
 }  // namespace internal
 }  // namespace v8
 
+#include "src/objects/object-macros-undef.h"
 #undef TRACE_IFT