From 7585aaf3e311913c2e2d4d11d89275c0513c1d13 Mon Sep 17 00:00:00 2001 From: Clemens Backes Date: Fri, 5 Mar 2021 18:35:25 +0100 Subject: [PATCH] [IWYU] Fix includes of wasm-engine.h Remove the include from js-array-buffer-inl.h, because the wasm engine is not used in that file. Add missing includes in other files that relied on the recursive include. R=jkummerow@chromium.org Bug: v8:11238 Cq-Include-Trybots: luci.v8.try:v8_linux64_no_wasm_compile_rel Change-Id: I8b7f11ce92858cbc0ccf26925159486ed39573fa Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2739650 Reviewed-by: Jakob Kummerow Commit-Queue: Clemens Backes Cr-Commit-Position: refs/heads/master@{#73254} --- src/logging/log.cc | 1 + src/objects/js-array-buffer-inl.h | 1 - src/wasm/c-api.cc | 1 + src/wasm/function-compiler.cc | 1 + src/wasm/wasm-code-manager.cc | 1 + src/wasm/wasm-debug.cc | 1 + src/wasm/wasm-serialization.cc | 1 + test/cctest/compiler/test-code-generator.cc | 1 + test/cctest/wasm/test-wasm-metrics.cc | 1 + test/cctest/wasm/wasm-run-utils.cc | 1 + test/unittests/objects/value-serializer-unittest.cc | 1 + test/unittests/wasm/module-decoder-memory64-unittest.cc | 1 + test/unittests/wasm/module-decoder-unittest.cc | 5 +++-- 13 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/logging/log.cc b/src/logging/log.cc index a0e96f503d..4aa779d9b1 100644 --- a/src/logging/log.cc +++ b/src/logging/log.cc @@ -44,6 +44,7 @@ #include "src/utils/memcopy.h" #include "src/utils/version.h" #include "src/wasm/wasm-code-manager.h" +#include "src/wasm/wasm-engine.h" #include "src/wasm/wasm-objects-inl.h" namespace v8 { diff --git a/src/objects/js-array-buffer-inl.h b/src/objects/js-array-buffer-inl.h index 12f8ef7796..66389ce431 100644 --- a/src/objects/js-array-buffer-inl.h +++ b/src/objects/js-array-buffer-inl.h @@ -12,7 +12,6 @@ #include "src/heap/heap-write-barrier-inl.h" #include "src/objects/js-objects-inl.h" #include "src/objects/objects-inl.h" -#include "src/wasm/wasm-engine.h" // Has to be the last include (doesn't have include guards): #include "src/objects/object-macros.h" diff --git a/src/wasm/c-api.cc b/src/wasm/c-api.cc index 7d78e34a03..be4f9464d0 100644 --- a/src/wasm/c-api.cc +++ b/src/wasm/c-api.cc @@ -35,6 +35,7 @@ #include "src/wasm/module-instantiate.h" #include "src/wasm/wasm-arguments.h" #include "src/wasm/wasm-constants.h" +#include "src/wasm/wasm-engine.h" #include "src/wasm/wasm-objects.h" #include "src/wasm/wasm-result.h" #include "src/wasm/wasm-serialization.h" diff --git a/src/wasm/function-compiler.cc b/src/wasm/function-compiler.cc index 0129d4d8e7..fe6aa115ed 100644 --- a/src/wasm/function-compiler.cc +++ b/src/wasm/function-compiler.cc @@ -14,6 +14,7 @@ #include "src/utils/ostreams.h" #include "src/wasm/baseline/liftoff-compiler.h" #include "src/wasm/wasm-code-manager.h" +#include "src/wasm/wasm-engine.h" namespace v8 { namespace internal { diff --git a/src/wasm/wasm-code-manager.cc b/src/wasm/wasm-code-manager.cc index 052c20f151..6e87f06e18 100644 --- a/src/wasm/wasm-code-manager.cc +++ b/src/wasm/wasm-code-manager.cc @@ -28,6 +28,7 @@ #include "src/wasm/jump-table-assembler.h" #include "src/wasm/module-compiler.h" #include "src/wasm/wasm-debug.h" +#include "src/wasm/wasm-engine.h" #include "src/wasm/wasm-import-wrapper-cache.h" #include "src/wasm/wasm-module-sourcemap.h" #include "src/wasm/wasm-module.h" diff --git a/src/wasm/wasm-debug.cc b/src/wasm/wasm-debug.cc index 2bad503935..a3bdcbd8d6 100644 --- a/src/wasm/wasm-debug.cc +++ b/src/wasm/wasm-debug.cc @@ -20,6 +20,7 @@ #include "src/wasm/module-decoder.h" #include "src/wasm/value-type.h" #include "src/wasm/wasm-code-manager.h" +#include "src/wasm/wasm-engine.h" #include "src/wasm/wasm-limits.h" #include "src/wasm/wasm-module.h" #include "src/wasm/wasm-objects-inl.h" diff --git a/src/wasm/wasm-serialization.cc b/src/wasm/wasm-serialization.cc index 447e814040..b2e6f0c4d8 100644 --- a/src/wasm/wasm-serialization.cc +++ b/src/wasm/wasm-serialization.cc @@ -19,6 +19,7 @@ #include "src/wasm/module-compiler.h" #include "src/wasm/module-decoder.h" #include "src/wasm/wasm-code-manager.h" +#include "src/wasm/wasm-engine.h" #include "src/wasm/wasm-module.h" #include "src/wasm/wasm-objects-inl.h" #include "src/wasm/wasm-objects.h" diff --git a/test/cctest/compiler/test-code-generator.cc b/test/cctest/compiler/test-code-generator.cc index a0534c9fa7..c6ea56477f 100644 --- a/test/cctest/compiler/test-code-generator.cc +++ b/test/cctest/compiler/test-code-generator.cc @@ -15,6 +15,7 @@ #include "src/objects/heap-number-inl.h" #include "src/objects/objects-inl.h" #include "src/objects/smi.h" +#include "src/wasm/wasm-engine.h" #include "test/cctest/cctest.h" #include "test/cctest/compiler/code-assembler-tester.h" #include "test/cctest/compiler/codegen-tester.h" diff --git a/test/cctest/wasm/test-wasm-metrics.cc b/test/cctest/wasm/test-wasm-metrics.cc index 2c49e2de81..b55b971b71 100644 --- a/test/cctest/wasm/test-wasm-metrics.cc +++ b/test/cctest/wasm/test-wasm-metrics.cc @@ -7,6 +7,7 @@ #include "include/libplatform/libplatform.h" #include "include/v8-metrics.h" #include "src/api/api-inl.h" +#include "src/wasm/wasm-engine.h" #include "src/wasm/wasm-module-builder.h" #include "test/cctest/cctest.h" #include "test/common/wasm/flag-utils.h" diff --git a/test/cctest/wasm/wasm-run-utils.cc b/test/cctest/wasm/wasm-run-utils.cc index 2c34a9f56e..de38825b56 100644 --- a/test/cctest/wasm/wasm-run-utils.cc +++ b/test/cctest/wasm/wasm-run-utils.cc @@ -10,6 +10,7 @@ #include "src/wasm/graph-builder-interface.h" #include "src/wasm/leb-helper.h" #include "src/wasm/module-compiler.h" +#include "src/wasm/wasm-engine.h" #include "src/wasm/wasm-import-wrapper-cache.h" #include "src/wasm/wasm-objects-inl.h" #include "src/wasm/wasm-opcodes.h" diff --git a/test/unittests/objects/value-serializer-unittest.cc b/test/unittests/objects/value-serializer-unittest.cc index afefdc1f45..e2e888b72b 100644 --- a/test/unittests/objects/value-serializer-unittest.cc +++ b/test/unittests/objects/value-serializer-unittest.cc @@ -12,6 +12,7 @@ #include "src/base/build_config.h" #include "src/objects/backing-store.h" #include "src/objects/objects-inl.h" +#include "src/wasm/wasm-engine.h" #include "src/wasm/wasm-objects.h" #include "src/wasm/wasm-result.h" #include "test/unittests/test-utils.h" diff --git a/test/unittests/wasm/module-decoder-memory64-unittest.cc b/test/unittests/wasm/module-decoder-memory64-unittest.cc index edd12b022a..1109200a9a 100644 --- a/test/unittests/wasm/module-decoder-memory64-unittest.cc +++ b/test/unittests/wasm/module-decoder-memory64-unittest.cc @@ -4,6 +4,7 @@ #include "src/objects/objects-inl.h" #include "src/wasm/module-decoder.h" +#include "src/wasm/wasm-engine.h" #include "src/wasm/wasm-features.h" #include "src/wasm/wasm-limits.h" #include "test/common/wasm/wasm-macro-gen.h" diff --git a/test/unittests/wasm/module-decoder-unittest.cc b/test/unittests/wasm/module-decoder-unittest.cc index 7f30fc1f09..3a9fec0c99 100644 --- a/test/unittests/wasm/module-decoder-unittest.cc +++ b/test/unittests/wasm/module-decoder-unittest.cc @@ -2,16 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "test/unittests/test-utils.h" +#include "src/wasm/module-decoder.h" #include "src/handles/handles.h" #include "src/objects/objects-inl.h" -#include "src/wasm/module-decoder.h" +#include "src/wasm/wasm-engine.h" #include "src/wasm/wasm-features.h" #include "src/wasm/wasm-limits.h" #include "src/wasm/wasm-opcodes.h" #include "test/common/wasm/flag-utils.h" #include "test/common/wasm/wasm-macro-gen.h" +#include "test/unittests/test-utils.h" #include "testing/gmock-support.h" using testing::HasSubstr;