Reland "Remove some unused includes"

This is a reland of commit 2d74bfa4

Difference compared to original: Restore one needed include.

Original change's description:
> Remove some unused includes
>
> Mostly src/api, src/asmjs. src/ast, src/base, src/wasm.
>
> Bug: v8:13006
> Change-Id: If4e85afe003fda9f8a681077827c3502e939fe57
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3742702
> Reviewed-by: Thibaud Michaud <thibaudm@chromium.org>
> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
> Reviewed-by: Toon Verwaest <verwaest@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#81523}

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

src/api/api-arguments-inl.h

@@ -12,7 +12,6 @@
 #include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/api-callbacks.h"
 #include "src/objects/slots-inl.h"
-#include "src/tracing/trace-event.h"
 
 namespace v8 {
 namespace internal {

src/api/api-arguments.h

@@ -6,8 +6,6 @@
 #define V8_API_API_ARGUMENTS_H_
 
 #include "include/v8-template.h"
-#include "src/api/api.h"
-#include "src/debug/debug.h"
 #include "src/execution/isolate.h"
 #include "src/objects/slots.h"
 #include "src/objects/visitors.h"

src/api/api-inl.h

@@ -9,11 +9,9 @@
 #include "src/api/api.h"
 #include "src/execution/interrupts-scope.h"
 #include "src/execution/microtask-queue.h"
-#include "src/execution/protectors.h"
 #include "src/handles/handles-inl.h"
 #include "src/heap/heap-inl.h"
 #include "src/objects/foreign-inl.h"
-#include "src/objects/js-weak-refs.h"
 #include "src/objects/objects-inl.h"
 
 namespace v8 {

src/api/api-natives.cc

@@ -4,15 +4,12 @@
 
 #include "src/api/api-natives.h"
 
-#include "src/api/api-inl.h"
 #include "src/common/message-template.h"
 #include "src/execution/isolate-inl.h"
 #include "src/heap/heap-inl.h"
 #include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/api-callbacks.h"
-#include "src/objects/hash-table-inl.h"
 #include "src/objects/lookup.h"
-#include "src/objects/property-cell.h"
 #include "src/objects/templates.h"
 
 namespace v8 {

src/api/api-natives.h

@@ -6,7 +6,6 @@
 #define V8_API_API_NATIVES_H_
 
 #include "include/v8-template.h"
-#include "src/base/macros.h"
 #include "src/handles/handles.h"
 #include "src/handles/maybe-handles.h"
 #include "src/objects/objects.h"

src/api/api.h

@@ -13,7 +13,6 @@
 #include "include/v8-typed-array.h"
 #include "include/v8-wasm.h"
 #include "src/execution/isolate.h"
-#include "src/heap/factory.h"
 #include "src/objects/bigint.h"
 #include "src/objects/contexts.h"
 #include "src/objects/js-collection.h"

src/asmjs/asm-scanner.h

@@ -12,7 +12,6 @@
 #include "src/asmjs/asm-names.h"
 #include "src/base/logging.h"
 #include "src/base/strings.h"
-#include "src/common/globals.h"
 
 namespace v8 {
 namespace internal {

src/asmjs/asm-types.cc

@@ -6,9 +6,6 @@
 
 #include <cinttypes>
 
-#include "src/init/v8.h"
-#include "src/utils/utils.h"
-
 namespace v8 {
 namespace internal {
 namespace wasm {

src/asmjs/asm-types.h

@@ -9,7 +9,6 @@
 
 #include "src/base/compiler-specific.h"
 #include "src/base/macros.h"
-#include "src/common/globals.h"
 #include "src/zone/zone-containers.h"
 #include "src/zone/zone.h"
 

src/ast/ast-function-literal-id-reindexer.cc

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "src/ast/ast-function-literal-id-reindexer.h"
-#include "src/objects/objects-inl.h"
 
 #include "src/ast/ast.h"
 

src/ast/ast-function-literal-id-reindexer.h

@@ -6,7 +6,6 @@
 #define V8_AST_AST_FUNCTION_LITERAL_ID_REINDEXER_H_
 
 #include "src/ast/ast-traversal-visitor.h"
-#include "src/base/macros.h"
 
 #ifdef DEBUG
 #include <set>

src/ast/ast-traversal-visitor.h

@@ -7,6 +7,7 @@
 
 #include "src/ast/ast.h"
 #include "src/ast/scopes.h"
+#include "src/execution/isolate.h"
 
 namespace v8 {
 namespace internal {

src/ast/ast-value-factory.cc

@@ -29,14 +29,10 @@
 
 #include "src/base/hashmap-entry.h"
 #include "src/base/logging.h"
-#include "src/base/platform/wrappers.h"
 #include "src/common/globals.h"
 #include "src/heap/factory-inl.h"
 #include "src/heap/local-factory-inl.h"
-#include "src/objects/objects-inl.h"
-#include "src/objects/objects.h"
 #include "src/objects/string.h"
-#include "src/strings/char-predicates-inl.h"
 #include "src/strings/string-hasher.h"
 #include "src/utils/utils-inl.h"
 

src/ast/ast-value-factory.h

@@ -33,8 +33,9 @@
 #include "src/base/hashmap.h"
 #include "src/base/logging.h"
 #include "src/common/globals.h"
-#include "src/heap/factory.h"
+#include "src/handles/handles.h"
 #include "src/numbers/conversions.h"
+#include "src/objects/name.h"
 
 // Ast(Raw|Cons)String and AstValueFactory are for storing strings and
 // values independent of the V8 heap and internalizing them later. During

src/ast/prettyprinter.cc

@@ -8,7 +8,6 @@
 
 #include "src/ast/ast-value-factory.h"
 #include "src/ast/scopes.h"
-#include "src/base/platform/platform.h"
 #include "src/base/strings.h"
 #include "src/base/vector.h"
 #include "src/common/globals.h"

src/ast/prettyprinter.h

@@ -9,8 +9,8 @@
 
 #include "src/ast/ast.h"
 #include "src/base/compiler-specific.h"
+#include "src/execution/isolate.h"
 #include "src/objects/function-kind.h"
-#include "src/utils/allocation.h"
 
 namespace v8 {
 namespace internal {

src/ast/scopes.cc

@@ -12,16 +12,13 @@
 #include "src/builtins/accessors.h"
 #include "src/common/message-template.h"
 #include "src/heap/local-factory-inl.h"
-#include "src/init/bootstrapper.h"
 #include "src/logging/runtime-call-stats-scope.h"
-#include "src/objects/module-inl.h"
-#include "src/objects/objects-inl.h"
 #include "src/objects/scope-info.h"
-#include "src/objects/string-set-inl.h"
+#include "src/objects/string-inl.h"
+#include "src/objects/string-set.h"
 #include "src/parsing/parse-info.h"
 #include "src/parsing/parser.h"
 #include "src/parsing/preparse-data.h"
-#include "src/zone/zone-list-inl.h"
 #include "src/zone/zone.h"
 
 namespace v8 {

src/ast/scopes.h

@@ -14,8 +14,6 @@
 #include "src/base/threaded-list.h"
 #include "src/common/globals.h"
 #include "src/objects/function-kind.h"
-#include "src/objects/objects.h"
-#include "src/utils/utils.h"
 #include "src/zone/zone-hashmap.h"
 #include "src/zone/zone.h"
 

src/ast/variables.cc

@@ -6,7 +6,6 @@
 
 #include "src/ast/scopes.h"
 #include "src/common/globals.h"
-#include "src/objects/objects-inl.h"
 
 namespace v8 {
 namespace internal {

src/ast/variables.h

@@ -8,7 +8,6 @@
 #include "src/ast/ast-value-factory.h"
 #include "src/base/threaded-list.h"
 #include "src/common/globals.h"
-#include "src/execution/isolate.h"
 #include "src/zone/zone.h"
 
 namespace v8 {

src/base/numbers/cached-powers.cc

@@ -11,6 +11,7 @@
 #include <cmath>
 
 #include "src/base/logging.h"
+#include "src/base/macros.h"
 
 namespace v8 {
 namespace base {

src/base/numbers/cached-powers.h

@@ -5,7 +5,6 @@
 #ifndef V8_BASE_NUMBERS_CACHED_POWERS_H_
 #define V8_BASE_NUMBERS_CACHED_POWERS_H_
 
-#include "src/base/logging.h"
 #include "src/base/numbers/diy-fp.h"
 
 namespace v8 {

src/base/numbers/diy-fp.h

@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "src/base/logging.h"
-#include "src/base/macros.h"
 
 namespace v8 {
 namespace base {

src/bigint/mul-fft.cc

@@ -10,7 +10,6 @@
 #include "src/bigint/bigint-internal.h"
 #include "src/bigint/digit-arithmetic.h"
 #include "src/bigint/util.h"
-#include "src/bigint/vector-arithmetic.h"
 
 namespace v8 {
 namespace bigint {

src/builtins/x64/builtins-x64.cc

@@ -31,6 +31,7 @@
 #if V8_ENABLE_WEBASSEMBLY
 #include "src/wasm/baseline/liftoff-assembler-defs.h"
 #include "src/wasm/object-access.h"
+#include "src/wasm/stacks.h"
 #include "src/wasm/wasm-constants.h"
 #include "src/wasm/wasm-linkage.h"
 #include "src/wasm/wasm-objects.h"

src/execution/frames.cc

@@ -29,6 +29,7 @@
 
 #if V8_ENABLE_WEBASSEMBLY
 #include "src/debug/debug-wasm-objects.h"
+#include "src/wasm/stacks.h"
 #include "src/wasm/wasm-code-manager.h"
 #include "src/wasm/wasm-engine.h"
 #include "src/wasm/wasm-objects-inl.h"

src/execution/isolate.cc

@@ -41,6 +41,7 @@
 #include "src/debug/debug-frames.h"
 #if V8_ENABLE_WEBASSEMBLY
 #include "src/debug/debug-wasm-objects.h"
+#include "src/wasm/stacks.h"
 #endif  // V8_ENABLE_WEBASSEMBLY
 #include "src/debug/debug.h"
 #include "src/deoptimizer/deoptimizer.h"

src/execution/isolate.h

@@ -39,9 +39,7 @@
 #include "src/objects/debug-objects.h"
 #include "src/objects/js-objects.h"
 #include "src/runtime/runtime.h"
-#include "src/sandbox/external-pointer-table.h"
 #include "src/sandbox/sandbox.h"
-#include "src/strings/unicode.h"
 #include "src/utils/allocation.h"
 
 #ifdef DEBUG

src/interpreter/bytecode-generator.h

@@ -6,6 +6,7 @@
 #define V8_INTERPRETER_BYTECODE_GENERATOR_H_
 
 #include "src/ast/ast.h"
+#include "src/execution/isolate.h"
 #include "src/interpreter/bytecode-array-builder.h"
 #include "src/interpreter/bytecode-label.h"
 #include "src/interpreter/bytecode-register.h"

src/wasm/assembler-buffer-cache.cc

@@ -6,7 +6,6 @@
 
 #include <algorithm>
 
-#include "src/base/bits.h"
 #include "src/codegen/assembler.h"
 #include "src/wasm/wasm-engine.h"
 

src/wasm/canonical-types.h

@@ -11,7 +11,6 @@
 
 #include <unordered_map>
 
-#include "src/base/lazy-instance.h"
 #include "src/wasm/wasm-module.h"
 
 namespace v8 {

src/wasm/code-space-access.h

@@ -11,7 +11,6 @@
 
 #include "src/base/build_config.h"
 #include "src/base/macros.h"
-#include "src/common/globals.h"
 
 namespace v8 {
 namespace internal {

src/wasm/constant-expression-interface.cc

@@ -8,7 +8,6 @@
 #include "src/handles/handles-inl.h"
 #include "src/objects/fixed-array-inl.h"
 #include "src/objects/oddball.h"
-#include "src/roots/roots-inl.h"
 #include "src/wasm/decoder.h"
 #include "src/wasm/function-body-decoder-impl.h"
 #include "src/wasm/wasm-objects.h"

src/wasm/decoder.h

@@ -17,11 +17,10 @@
 #include "src/base/memory.h"
 #include "src/base/strings.h"
 #include "src/base/vector.h"
-#include "src/codegen/signature.h"
 #include "src/flags/flags.h"
+#include "src/utils/utils.h"
 #include "src/wasm/wasm-opcodes.h"
 #include "src/wasm/wasm-result.h"
-#include "src/zone/zone-containers.h"
 
 namespace v8 {
 namespace internal {

src/wasm/function-body-decoder-impl.h

@@ -14,8 +14,6 @@
 
 #include <inttypes.h>
 
-#include "src/base/platform/elapsed-timer.h"
-#include "src/base/platform/wrappers.h"
 #include "src/base/small-vector.h"
 #include "src/base/strings.h"
 #include "src/utils/bit-vector.h"

src/wasm/function-body-decoder.cc

@@ -4,10 +4,6 @@
 
 #include "src/wasm/function-body-decoder.h"
 
-#include "src/codegen/assembler-inl.h"
-#include "src/flags/flags.h"
-#include "src/handles/handles.h"
-#include "src/objects/objects-inl.h"
 #include "src/utils/ostreams.h"
 #include "src/wasm/decoder.h"
 #include "src/wasm/function-body-decoder-impl.h"

src/wasm/function-body-decoder.h

@@ -15,10 +15,12 @@
 #include "src/wasm/decoder.h"
 #include "src/wasm/wasm-opcodes.h"
 #include "src/wasm/wasm-result.h"
+#include "src/zone/zone-containers.h"
 
 namespace v8 {
 namespace internal {
 
+class AccountingAllocator;
 class BitVector;  // forward declaration
 
 namespace wasm {

src/wasm/function-compiler.cc

@@ -4,16 +4,13 @@
 
 #include "src/wasm/function-compiler.h"
 
-#include "src/base/platform/time.h"
-#include "src/base/strings.h"
 #include "src/codegen/compiler.h"
-#include "src/codegen/macro-assembler-inl.h"
 #include "src/codegen/optimized-compilation-info.h"
 #include "src/compiler/wasm-compiler.h"
-#include "src/diagnostics/code-tracer.h"
+#include "src/handles/handles-inl.h"
 #include "src/logging/counters-scopes.h"
 #include "src/logging/log.h"
-#include "src/utils/ostreams.h"
+#include "src/objects/code-inl.h"
 #include "src/wasm/baseline/liftoff-compiler.h"
 #include "src/wasm/wasm-code-manager.h"
 #include "src/wasm/wasm-debug.h"

src/wasm/function-compiler.h

@@ -13,7 +13,6 @@
 
 #include "src/codegen/assembler.h"
 #include "src/codegen/code-desc.h"
-#include "src/trap-handler/trap-handler.h"
 #include "src/wasm/compilation-environment.h"
 #include "src/wasm/function-body-decoder.h"
 #include "src/wasm/wasm-limits.h"

src/wasm/graph-builder-interface.cc

@@ -7,9 +7,6 @@
 #include "src/compiler/wasm-compiler-definitions.h"
 #include "src/compiler/wasm-compiler.h"
 #include "src/flags/flags.h"
-#include "src/handles/handles.h"
-#include "src/objects/objects-inl.h"
-#include "src/utils/ostreams.h"
 #include "src/wasm/branch-hint-map.h"
 #include "src/wasm/decoder.h"
 #include "src/wasm/function-body-decoder-impl.h"

src/wasm/graph-builder-interface.h

@@ -15,6 +15,8 @@
 namespace v8 {
 namespace internal {
 
+class AccountingAllocator;
+
 namespace compiler {  // external declarations from compiler.
 class NodeOriginTable;
 class WasmGraphBuilder;

src/wasm/jump-table-assembler.cc

@@ -4,7 +4,6 @@
 
 #include "src/wasm/jump-table-assembler.h"
 
-#include "src/codegen/assembler-inl.h"
 #include "src/codegen/macro-assembler-inl.h"
 
 namespace v8 {

src/wasm/local-decl-encoder.cc

@@ -4,7 +4,6 @@
 
 #include "src/wasm/local-decl-encoder.h"
 
-#include "src/base/platform/wrappers.h"
 #include "src/codegen/signature.h"
 #include "src/wasm/leb-helper.h"
 

src/wasm/memory-protection-key.cc

@@ -10,10 +10,8 @@
 #undef MAP_TYPE  // Conflicts with MAP_TYPE in Torque-generated instance-types.h
 #endif
 
-#include "src/base/build_config.h"
 #include "src/base/logging.h"
 #include "src/base/macros.h"
-#include "src/base/platform/platform.h"
 
 // Runtime-detection of PKU support with {dlsym()}.
 //

src/wasm/module-compiler.cc

@@ -8,23 +8,18 @@
 #include <queue>
 
 #include "src/api/api-inl.h"
-#include "src/asmjs/asm-js.h"
 #include "src/base/enum-set.h"
 #include "src/base/optional.h"
 #include "src/base/platform/mutex.h"
 #include "src/base/platform/semaphore.h"
 #include "src/base/platform/time.h"
-#include "src/base/utils/random-number-generator.h"
 #include "src/compiler/wasm-compiler.h"
+#include "src/debug/debug.h"
 #include "src/handles/global-handles-inl.h"
 #include "src/heap/heap-inl.h"  // For CodePageCollectionMemoryModificationScope.
 #include "src/logging/counters-scopes.h"
 #include "src/logging/metrics.h"
-#include "src/objects/property-descriptor.h"
-#include "src/tasks/task-utils.h"
 #include "src/tracing/trace-event.h"
-#include "src/trap-handler/trap-handler.h"
-#include "src/utils/identity-map.h"
 #include "src/wasm/assembler-buffer-cache.h"
 #include "src/wasm/code-space-access.h"
 #include "src/wasm/module-decoder.h"

src/wasm/module-compiler.h

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

src/wasm/module-instantiate.cc

@@ -7,7 +7,6 @@
 #include "src/api/api-inl.h"
 #include "src/asmjs/asm-js.h"
 #include "src/base/atomicops.h"
-#include "src/base/platform/wrappers.h"
 #include "src/logging/counters-scopes.h"
 #include "src/logging/metrics.h"
 #include "src/numbers/conversions-inl.h"

src/wasm/module-instantiate.h

@@ -11,7 +11,6 @@
 
 #include <stdint.h>
 
-#include "include/v8config.h"
 #include "src/base/optional.h"
 #include "src/common/message-template.h"
 #include "src/wasm/wasm-value.h"

src/wasm/object-access.h

@@ -12,7 +12,6 @@
 #include "src/common/globals.h"
 #include "src/objects/fixed-array.h"
 #include "src/objects/js-function.h"
-#include "src/objects/js-objects.h"
 #include "src/objects/shared-function-info.h"
 
 namespace v8 {

src/wasm/signature-map.h

@@ -11,6 +11,7 @@
 
 #include <unordered_map>
 
+#include "src/base/functional.h"
 #include "src/codegen/signature.h"
 #include "src/wasm/value-type.h"
 

src/wasm/stacks.h

@@ -9,7 +9,6 @@
 #error This header should only be included if WebAssembly is enabled.
 #endif  // !V8_ENABLE_WEBASSEMBLY
 
-#include "src/base/build_config.h"
 #include "src/common/globals.h"
 #include "src/execution/isolate.h"
 #include "src/utils/allocation.h"

src/wasm/streaming-decoder.cc

@@ -4,11 +4,7 @@
 
 #include "src/wasm/streaming-decoder.h"
 
-#include "src/base/platform/wrappers.h"
-#include "src/handles/handles.h"
-#include "src/objects/descriptor-array.h"
-#include "src/objects/dictionary.h"
-#include "src/objects/objects-inl.h"
+#include "src/logging/counters.h"
 #include "src/wasm/decoder.h"
 #include "src/wasm/leb-helper.h"
 #include "src/wasm/module-decoder.h"

src/wasm/wasm-code-manager.h

@@ -19,7 +19,6 @@
 #include "src/base/address-region.h"
 #include "src/base/bit-field.h"
 #include "src/base/macros.h"
-#include "src/base/optional.h"
 #include "src/base/vector.h"
 #include "src/builtins/builtins.h"
 #include "src/handles/handles.h"

src/wasm/wasm-debug.cc

@@ -7,9 +7,6 @@
 #include <iomanip>
 #include <unordered_map>
 
-#include "src/base/optional.h"
-#include "src/base/platform/wrappers.h"
-#include "src/codegen/assembler-inl.h"
 #include "src/common/assert-scope.h"
 #include "src/compiler/wasm-compiler.h"
 #include "src/debug/debug-evaluate.h"

src/wasm/wasm-engine.cc

@@ -7,6 +7,7 @@
 #include "src/base/functional.h"
 #include "src/base/platform/time.h"
 #include "src/common/globals.h"
+#include "src/debug/debug.h"
 #include "src/diagnostics/code-tracer.h"
 #include "src/diagnostics/compilation-statistics.h"
 #include "src/execution/frames.h"
@@ -15,7 +16,6 @@
 #include "src/logging/counters.h"
 #include "src/logging/metrics.h"
 #include "src/objects/heap-number.h"
-#include "src/objects/js-promise.h"
 #include "src/objects/managed-inl.h"
 #include "src/objects/objects-inl.h"
 #include "src/strings/string-hasher-inl.h"
@@ -25,6 +25,7 @@
 #include "src/wasm/module-compiler.h"
 #include "src/wasm/module-decoder.h"
 #include "src/wasm/module-instantiate.h"
+#include "src/wasm/stacks.h"
 #include "src/wasm/streaming-decoder.h"
 #include "src/wasm/wasm-debug.h"
 #include "src/wasm/wasm-limits.h"

src/wasm/wasm-external-refs.cc

@@ -8,7 +8,6 @@
 
 #include <limits>
 
-#include "include/v8config.h"
 #include "src/base/bits.h"
 #include "src/base/ieee754.h"
 #include "src/base/safe_conversions.h"

src/wasm/wasm-external-refs.h

@@ -11,12 +11,14 @@
 
 #include <stdint.h>
 
-#include "src/common/globals.h"
+#include "src/base/macros.h"
 
 namespace v8 {
 namespace internal {
 namespace wasm {
 
+using Address = uintptr_t;
+
 V8_EXPORT_PRIVATE void f32_trunc_wrapper(Address data);
 
 V8_EXPORT_PRIVATE void f32_floor_wrapper(Address data);

src/wasm/wasm-import-wrapper-cache.cc

@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#include "src/logging/counters.h"
 #include "src/wasm/wasm-code-manager.h"
 
 namespace v8 {

src/wasm/wasm-js.cc

@@ -13,31 +13,20 @@
 #include "include/v8-wasm.h"
 #include "src/api/api-inl.h"
 #include "src/api/api-natives.h"
-#include "src/ast/ast.h"
 #include "src/base/logging.h"
-#include "src/base/overflowing-math.h"
-#include "src/base/platform/wrappers.h"
 #include "src/common/allow-deprecated.h"
-#include "src/common/assert-scope.h"
 #include "src/execution/execution.h"
-#include "src/execution/frames-inl.h"
 #include "src/execution/isolate.h"
 #include "src/execution/messages.h"
-#include "src/handles/global-handles-inl.h"
 #include "src/handles/handles.h"
 #include "src/heap/factory.h"
-#include "src/init/v8.h"
 #include "src/objects/fixed-array.h"
 #include "src/objects/instance-type.h"
 #include "src/objects/js-function.h"
-#include "src/objects/js-promise-inl.h"
 #include "src/objects/managed-inl.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/shared-function-info.h"
 #include "src/objects/templates.h"
-#include "src/parsing/parse-info.h"
-#include "src/tasks/task-utils.h"
-#include "src/trap-handler/trap-handler.h"
 #include "src/wasm/function-compiler.h"
 #include "src/wasm/streaming-decoder.h"
 #include "src/wasm/value-type.h"

src/wasm/wasm-linkage.h

@@ -12,7 +12,6 @@
 #include "src/codegen/aligned-slot-allocator.h"
 #include "src/codegen/assembler-arch.h"
 #include "src/codegen/machine-type.h"
-#include "src/codegen/signature.h"
 #include "src/wasm/value-type.h"
 
 namespace v8 {

src/wasm/wasm-module-builder.cc

@@ -4,11 +4,7 @@
 
 #include "src/wasm/wasm-module-builder.h"
 
-#include "src/base/memory.h"
 #include "src/codegen/signature.h"
-#include "src/handles/handles.h"
-#include "src/init/v8.h"
-#include "src/objects/objects-inl.h"
 #include "src/wasm/function-body-decoder.h"
 #include "src/wasm/leb-helper.h"
 #include "src/wasm/wasm-constants.h"

src/wasm/wasm-module-sourcemap.cc

@@ -11,7 +11,6 @@
 #include "include/v8-local-handle.h"
 #include "include/v8-object.h"
 #include "include/v8-primitive.h"
-#include "src/api/api.h"
 #include "src/base/vlq-base64.h"
 
 namespace v8 {

src/wasm/wasm-module.h

@@ -13,8 +13,8 @@
 #include <memory>
 
 #include "src/base/optional.h"
-#include "src/base/platform/wrappers.h"
 #include "src/base/vector.h"
+#include "src/codegen/signature.h"
 #include "src/common/globals.h"
 #include "src/handles/handles.h"
 #include "src/wasm/branch-hint-map.h"

src/wasm/wasm-objects.cc

@@ -6,18 +6,13 @@
 
 #include "src/base/iterator.h"
 #include "src/base/vector.h"
-#include "src/codegen/assembler-inl.h"
-#include "src/codegen/code-factory.h"
 #include "src/compiler/wasm-compiler.h"
-#include "src/debug/debug-interface.h"
+#include "src/debug/debug.h"
 #include "src/logging/counters.h"
-#include "src/objects/debug-objects-inl.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/objects/struct-inl.h"
-#include "src/trap-handler/trap-handler.h"
 #include "src/utils/utils.h"
 #include "src/wasm/code-space-access.h"
 #include "src/wasm/jump-table-assembler.h"
@@ -1613,7 +1608,8 @@ 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);
-  CONDITIONAL_WRITE_BARRIER(*this, element_offset(index), *value, mode);
+  CombinedWriteBarrier(*this, this->RawField(element_offset(index)), *value,
+                       mode);
 }
 
 // static

src/wasm/wasm-objects.h

@@ -11,14 +11,12 @@
 
 #include <memory>
 
-#include "src/base/bit-field.h"
-#include "src/base/bits.h"
-#include "src/codegen/signature.h"
-#include "src/debug/debug.h"
-#include "src/heap/heap.h"
+#include "src/debug/interface-types.h"
+#include "src/objects/foreign.h"
 #include "src/objects/js-function.h"
 #include "src/objects/js-objects.h"
 #include "src/objects/objects.h"
+#include "src/objects/struct.h"
 #include "src/wasm/module-instantiate.h"
 #include "src/wasm/stacks.h"
 #include "src/wasm/struct-types.h"

src/wasm/wasm-opcodes-inl.h

@@ -14,7 +14,6 @@
 #include "src/base/template-utils.h"
 #include "src/codegen/signature.h"
 #include "src/execution/messages.h"
-#include "src/runtime/runtime.h"
 #include "src/wasm/wasm-opcodes.h"
 
 namespace v8 {

src/wasm/wasm-opcodes.h

@@ -11,7 +11,6 @@
 
 #include <memory>
 
-#include "src/base/platform/wrappers.h"
 #include "src/common/globals.h"
 #include "src/common/message-template.h"
 #include "src/wasm/value-type.h"

src/wasm/wasm-result.cc

@@ -4,11 +4,9 @@
 
 #include "src/wasm/wasm-result.h"
 
-#include "src/base/platform/platform.h"
 #include "src/base/strings.h"
 #include "src/execution/isolate-inl.h"
 #include "src/heap/factory.h"
-#include "src/heap/heap.h"
 #include "src/objects/objects.h"
 
 namespace v8 {

src/wasm/wasm-serialization.cc

@@ -4,15 +4,12 @@
 
 #include "src/wasm/wasm-serialization.h"
 
-#include "src/base/platform/wrappers.h"
+#include "src/codegen/assembler-arch.h"
 #include "src/codegen/assembler-inl.h"
-#include "src/codegen/external-reference-table.h"
-#include "src/objects/objects-inl.h"
-#include "src/objects/objects.h"
+#include "src/debug/debug.h"
 #include "src/runtime/runtime.h"
-#include "src/snapshot/code-serializer.h"
+#include "src/snapshot/snapshot-data.h"
 #include "src/utils/ostreams.h"
-#include "src/utils/utils.h"
 #include "src/utils/version.h"
 #include "src/wasm/code-space-access.h"
 #include "src/wasm/function-compiler.h"

src/wasm/wasm-subtyping.cc

@@ -4,10 +4,8 @@
 
 #include "src/wasm/wasm-subtyping.h"
 
-#include "src/base/platform/mutex.h"
 #include "src/wasm/canonical-types.h"
 #include "src/wasm/wasm-module.h"
-#include "src/zone/zone-containers.h"
 
 namespace v8 {
 namespace internal {

src/wasm/wasm-value.h

@@ -13,7 +13,6 @@
 #include "src/handles/handles.h"
 #include "src/utils/boxed-float.h"
 #include "src/wasm/value-type.h"
-#include "src/zone/zone-containers.h"
 
 namespace v8 {
 namespace internal {

test/common/wasm/wasm-module-runner.h

@@ -10,7 +10,6 @@
 #include "src/wasm/wasm-module.h"
 #include "src/wasm/wasm-objects.h"
 #include "src/wasm/wasm-result.h"
-#include "src/zone/zone.h"
 
 namespace v8 {
 namespace internal {

test/fuzzer/wasm-fuzzer-common.cc

@@ -12,7 +12,6 @@
 #include "include/v8-local-handle.h"
 #include "include/v8-metrics.h"
 #include "src/execution/isolate.h"
-#include "src/objects/objects-inl.h"
 #include "src/utils/ostreams.h"
 #include "src/wasm/baseline/liftoff-compiler.h"
 #include "src/wasm/function-body-decoder-impl.h"
@@ -25,7 +24,7 @@
 #include "src/wasm/wasm-opcodes-inl.h"
 #include "src/zone/accounting-allocator.h"
 #include "src/zone/zone.h"
-#include "test/common/wasm/flag-utils.h"
+#include "test/common/flag-utils.h"
 #include "test/common/wasm/wasm-module-runner.h"
 #include "test/fuzzer/fuzzer-support.h"