From 71e4c573199466ea4541e3d6b307c9b33d7bb785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marja=20H=C3=B6ltt=C3=A4?= Date: Wed, 23 May 2018 15:29:02 +0200 Subject: [PATCH] [objects.h splitting] Move TYPE_CHECKERs back to objects-inl.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Moving them away was a mistake. Fixing this enables getting rid of a bunch of includes. BUG=v8:5402 Cq-Include-Trybots: luci.chromium.try:linux_chromium_rel_ng Change-Id: I5482eab4281c7450350f058fe0a04a6f375ea082 Reviewed-on: https://chromium-review.googlesource.com/1070188 Reviewed-by: Michael Starzinger Reviewed-by: Jakob Gruber Reviewed-by: Igor Sheludko Commit-Queue: Marja Hölttä Cr-Commit-Position: refs/heads/master@{#53328} --- src/accessors.cc | 1 + src/api.cc | 4 ++ src/api.h | 2 + src/ast/modules.cc | 2 +- src/ast/scopes.cc | 2 +- src/bootstrapper.cc | 2 + src/builtins/builtins-arguments-gen.cc | 1 + src/builtins/builtins-array-gen.cc | 5 +- src/builtins/builtins-async-gen.cc | 1 + src/builtins/builtins-collections-gen.cc | 1 + src/builtins/builtins-collections.cc | 1 + src/builtins/builtins-promise-gen.cc | 1 + src/compiler/access-builder.cc | 3 ++ src/compiler/access-info.cc | 1 + src/compiler/js-call-reducer.cc | 1 + src/compiler/js-create-lowering.cc | 3 ++ src/compiler/js-typed-lowering.cc | 1 + src/contexts.cc | 1 + src/debug/debug-scopes.cc | 1 + src/debug/debug.cc | 1 + src/elements.cc | 1 + src/heap/factory.cc | 5 +- src/heap/mark-compact-inl.h | 1 + src/heap/object-stats.cc | 1 + src/heap/setup-heap-internal.cc | 2 + src/ic/accessor-assembler.cc | 1 + src/ic/ic.cc | 1 + src/interpreter/interpreter-generator.cc | 1 + src/isolate.cc | 1 + src/keys.cc | 1 + src/objects-body-descriptors-inl.h | 1 + src/objects-debug.cc | 6 ++- src/objects-inl.h | 46 +++++++++++++------ src/objects-printer.cc | 5 ++ src/objects.cc | 4 ++ src/objects/api-callbacks-inl.h | 2 - src/objects/arguments-inl.h | 2 - src/objects/code-inl.h | 4 -- src/objects/fixed-array-inl.h | 10 ++-- src/objects/js-array-inl.h | 4 -- src/objects/js-collection-inl.h | 5 -- src/objects/js-promise-inl.h | 1 - src/objects/js-regexp-inl.h | 2 - src/objects/js-regexp-string-iterator-inl.h | 2 - src/objects/map-inl.h | 2 - src/objects/module-inl.h | 5 -- src/objects/module.cc | 1 + src/objects/name-inl.h | 2 - src/objects/ordered-hash-table.cc | 1 + src/objects/promise-inl.h | 1 + src/objects/scope-info.cc | 2 + src/objects/shared-function-info-inl.h | 1 - src/profiler/heap-snapshot-generator.cc | 3 ++ src/regexp/jsregexp-inl.h | 1 + src/regexp/regexp-utils.cc | 1 + src/runtime/runtime-array.cc | 1 + src/runtime/runtime-collections.cc | 1 + src/runtime/runtime-debug.cc | 2 + src/runtime/runtime-forin.cc | 1 + src/runtime/runtime-literals.cc | 1 + src/runtime/runtime-module.cc | 2 + src/runtime/runtime-promise.cc | 1 + src/runtime/runtime-scopes.cc | 1 + src/value-serializer.cc | 2 + src/wasm/wasm-engine.cc | 1 + test/cctest/heap/test-heap.cc | 1 + .../bytecode-expectations-printer.cc | 7 ++- test/cctest/test-api.cc | 1 + test/cctest/test-weakmaps.cc | 1 + test/cctest/test-weaksets.cc | 1 + .../compiler/js-create-lowering-unittest.cc | 1 + tools/gen-postmortem-metadata.py | 2 + 72 files changed, 128 insertions(+), 63 deletions(-) diff --git a/src/accessors.cc b/src/accessors.cc index 565c019092..d28012c9f8 100644 --- a/src/accessors.cc +++ b/src/accessors.cc @@ -13,6 +13,7 @@ #include "src/isolate-inl.h" #include "src/messages.h" #include "src/objects/api-callbacks.h" +#include "src/objects/module-inl.h" #include "src/property-details.h" #include "src/prototype.h" diff --git a/src/api.cc b/src/api.cc index 17ef9ad345..f25803744a 100644 --- a/src/api.cc +++ b/src/api.cc @@ -47,6 +47,10 @@ #include "src/messages.h" #include "src/objects-inl.h" #include "src/objects/api-callbacks.h" +#include "src/objects/js-collection-inl.h" +#include "src/objects/js-promise-inl.h" +#include "src/objects/js-regexp-inl.h" +#include "src/objects/module-inl.h" #include "src/objects/ordered-hash-table-inl.h" #include "src/objects/templates.h" #include "src/parsing/parser.h" diff --git a/src/api.h b/src/api.h index d1297c8f38..50a33c36b9 100644 --- a/src/api.h +++ b/src/api.h @@ -12,6 +12,8 @@ #include "src/heap/factory.h" #include "src/isolate.h" #include "src/objects/js-collection.h" +#include "src/objects/js-promise.h" +#include "src/objects/module.h" namespace v8 { diff --git a/src/ast/modules.cc b/src/ast/modules.cc index b583f35793..065cffe931 100644 --- a/src/ast/modules.cc +++ b/src/ast/modules.cc @@ -6,7 +6,7 @@ #include "src/ast/ast-value-factory.h" #include "src/ast/scopes.h" #include "src/objects-inl.h" -#include "src/objects/module.h" +#include "src/objects/module-inl.h" #include "src/pending-compilation-error-handler.h" namespace v8 { diff --git a/src/ast/scopes.cc b/src/ast/scopes.cc index 42affeea2c..6abfc45036 100644 --- a/src/ast/scopes.cc +++ b/src/ast/scopes.cc @@ -13,7 +13,7 @@ #include "src/counters.h" #include "src/messages.h" #include "src/objects-inl.h" -#include "src/objects/module.h" +#include "src/objects/module-inl.h" #include "src/objects/scope-info.h" #include "src/parsing/parse-info.h" #include "src/parsing/preparsed-scope-data.h" diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc index 69e0a91cbb..36684cf3ae 100644 --- a/src/bootstrapper.cc +++ b/src/bootstrapper.cc @@ -20,11 +20,13 @@ #include "src/heap/heap.h" #include "src/isolate-inl.h" #include "src/objects/api-callbacks.h" +#include "src/objects/arguments.h" #ifdef V8_INTL_SUPPORT #include "src/objects/intl-objects.h" #include "src/objects/js-locale.h" #endif // V8_INTL_SUPPORT #include "src/objects/hash-table-inl.h" +#include "src/objects/js-regexp-string-iterator.h" #include "src/objects/js-regexp.h" #include "src/objects/templates.h" #include "src/snapshot/natives.h" diff --git a/src/builtins/builtins-arguments-gen.cc b/src/builtins/builtins-arguments-gen.cc index ba5ed13f32..be21450957 100644 --- a/src/builtins/builtins-arguments-gen.cc +++ b/src/builtins/builtins-arguments-gen.cc @@ -12,6 +12,7 @@ #include "src/frame-constants.h" #include "src/interface-descriptors.h" #include "src/objects-inl.h" +#include "src/objects/arguments.h" namespace v8 { namespace internal { diff --git a/src/builtins/builtins-array-gen.cc b/src/builtins/builtins-array-gen.cc index ec48780b8c..b08a769ff3 100644 --- a/src/builtins/builtins-array-gen.cc +++ b/src/builtins/builtins-array-gen.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "src/builtins/builtins-array-gen.h" + #include "src/builtins/builtins-iterator-gen.h" #include "src/builtins/builtins-string-gen.h" #include "src/builtins/builtins-typed-array-gen.h" @@ -10,8 +12,7 @@ #include "src/code-stub-assembler.h" #include "src/frame-constants.h" #include "src/heap/factory-inl.h" - -#include "src/builtins/builtins-array-gen.h" +#include "src/objects/arguments-inl.h" namespace v8 { namespace internal { diff --git a/src/builtins/builtins-async-gen.cc b/src/builtins/builtins-async-gen.cc index ba0226d7b3..3989a4900d 100644 --- a/src/builtins/builtins-async-gen.cc +++ b/src/builtins/builtins-async-gen.cc @@ -6,6 +6,7 @@ #include "src/builtins/builtins-utils-gen.h" #include "src/heap/factory-inl.h" +#include "src/objects/js-promise.h" #include "src/objects/shared-function-info.h" namespace v8 { diff --git a/src/builtins/builtins-collections-gen.cc b/src/builtins/builtins-collections-gen.cc index edbfb26a71..94f66b1dba 100644 --- a/src/builtins/builtins-collections-gen.cc +++ b/src/builtins/builtins-collections-gen.cc @@ -8,6 +8,7 @@ #include "src/code-stub-assembler.h" #include "src/heap/factory-inl.h" #include "src/objects/hash-table-inl.h" +#include "src/objects/js-collection.h" namespace v8 { namespace internal { diff --git a/src/builtins/builtins-collections.cc b/src/builtins/builtins-collections.cc index e3c97d3841..1c7874112c 100644 --- a/src/builtins/builtins-collections.cc +++ b/src/builtins/builtins-collections.cc @@ -5,6 +5,7 @@ #include "src/builtins/builtins-utils.h" #include "src/builtins/builtins.h" #include "src/objects-inl.h" +#include "src/objects/js-collection-inl.h" namespace v8 { namespace internal { diff --git a/src/builtins/builtins-promise-gen.cc b/src/builtins/builtins-promise-gen.cc index 6dcf9f5372..e672b7630c 100644 --- a/src/builtins/builtins-promise-gen.cc +++ b/src/builtins/builtins-promise-gen.cc @@ -11,6 +11,7 @@ #include "src/code-factory.h" #include "src/code-stub-assembler.h" #include "src/objects-inl.h" +#include "src/objects/js-promise.h" namespace v8 { namespace internal { diff --git a/src/compiler/access-builder.cc b/src/compiler/access-builder.cc index 7d4b175c45..67933baa81 100644 --- a/src/compiler/access-builder.cc +++ b/src/compiler/access-builder.cc @@ -10,6 +10,9 @@ #include "src/handles-inl.h" #include "src/heap/heap.h" #include "src/objects-inl.h" +#include "src/objects/arguments.h" +#include "src/objects/js-collection.h" +#include "src/objects/module.h" namespace v8 { namespace internal { diff --git a/src/compiler/access-info.cc b/src/compiler/access-info.cc index f33555cbe3..a205a3fb5e 100644 --- a/src/compiler/access-info.cc +++ b/src/compiler/access-info.cc @@ -12,6 +12,7 @@ #include "src/field-type.h" #include "src/ic/call-optimization.h" #include "src/objects-inl.h" +#include "src/objects/module-inl.h" #include "src/objects/templates.h" namespace v8 { diff --git a/src/compiler/js-call-reducer.cc b/src/compiler/js-call-reducer.cc index 1dbe60148b..3907f93e53 100644 --- a/src/compiler/js-call-reducer.cc +++ b/src/compiler/js-call-reducer.cc @@ -20,6 +20,7 @@ #include "src/feedback-vector-inl.h" #include "src/ic/call-optimization.h" #include "src/objects-inl.h" +#include "src/objects/arguments-inl.h" #include "src/vector-slot-pair.h" namespace v8 { diff --git a/src/compiler/js-create-lowering.cc b/src/compiler/js-create-lowering.cc index 63f933c764..3081865119 100644 --- a/src/compiler/js-create-lowering.cc +++ b/src/compiler/js-create-lowering.cc @@ -20,7 +20,10 @@ #include "src/compiler/simplified-operator.h" #include "src/compiler/state-values-utils.h" #include "src/objects-inl.h" +#include "src/objects/arguments.h" #include "src/objects/hash-table-inl.h" +#include "src/objects/js-promise.h" +#include "src/objects/js-regexp-inl.h" namespace v8 { namespace internal { diff --git a/src/compiler/js-typed-lowering.cc b/src/compiler/js-typed-lowering.cc index 5bb314b0de..5593961ab0 100644 --- a/src/compiler/js-typed-lowering.cc +++ b/src/compiler/js-typed-lowering.cc @@ -17,6 +17,7 @@ #include "src/compiler/type-cache.h" #include "src/compiler/types.h" #include "src/objects-inl.h" +#include "src/objects/module-inl.h" namespace v8 { namespace internal { diff --git a/src/contexts.cc b/src/contexts.cc index 2d2ff2d2ce..0fcf42a6ae 100644 --- a/src/contexts.cc +++ b/src/contexts.cc @@ -8,6 +8,7 @@ #include "src/bootstrapper.h" #include "src/debug/debug.h" #include "src/isolate-inl.h" +#include "src/objects/module-inl.h" namespace v8 { namespace internal { diff --git a/src/debug/debug-scopes.cc b/src/debug/debug-scopes.cc index 448a319e2a..ebe4ae8e41 100644 --- a/src/debug/debug-scopes.cc +++ b/src/debug/debug-scopes.cc @@ -12,6 +12,7 @@ #include "src/frames-inl.h" #include "src/globals.h" #include "src/isolate-inl.h" +#include "src/objects/module.h" #include "src/parsing/parse-info.h" #include "src/parsing/parsing.h" #include "src/parsing/rewriter.h" diff --git a/src/debug/debug.cc b/src/debug/debug.cc index 08cdf356f8..70bc3056bf 100644 --- a/src/debug/debug.cc +++ b/src/debug/debug.cc @@ -30,6 +30,7 @@ #include "src/log.h" #include "src/messages.h" #include "src/objects/debug-objects-inl.h" +#include "src/objects/js-promise-inl.h" #include "src/snapshot/natives.h" #include "src/snapshot/snapshot.h" #include "src/wasm/wasm-objects-inl.h" diff --git a/src/elements.cc b/src/elements.cc index c3698ae345..508cc31abe 100644 --- a/src/elements.cc +++ b/src/elements.cc @@ -11,6 +11,7 @@ #include "src/isolate-inl.h" #include "src/messages.h" #include "src/objects-inl.h" +#include "src/objects/arguments-inl.h" #include "src/objects/hash-table-inl.h" #include "src/utils.h" diff --git a/src/heap/factory.cc b/src/heap/factory.cc index ff1b773bbb..73235d98da 100644 --- a/src/heap/factory.cc +++ b/src/heap/factory.cc @@ -17,11 +17,14 @@ #include "src/isolate-inl.h" #include "src/macro-assembler.h" #include "src/objects/api-callbacks.h" +#include "src/objects/arguments-inl.h" #include "src/objects/bigint.h" #include "src/objects/debug-objects-inl.h" #include "src/objects/frame-array-inl.h" +#include "src/objects/js-collection-inl.h" +#include "src/objects/js-regexp-inl.h" #include "src/objects/microtask-inl.h" -#include "src/objects/module.h" +#include "src/objects/module-inl.h" #include "src/objects/promise-inl.h" #include "src/objects/scope-info.h" #include "src/unicode-cache.h" diff --git a/src/heap/mark-compact-inl.h b/src/heap/mark-compact-inl.h index 249144835a..946138167c 100644 --- a/src/heap/mark-compact-inl.h +++ b/src/heap/mark-compact-inl.h @@ -9,6 +9,7 @@ #include "src/heap/mark-compact.h" #include "src/heap/objects-visiting-inl.h" #include "src/heap/remembered-set.h" +#include "src/objects/js-collection-inl.h" namespace v8 { namespace internal { diff --git a/src/heap/object-stats.cc b/src/heap/object-stats.cc index 3ac6c3faa7..ef44e1d839 100644 --- a/src/heap/object-stats.cc +++ b/src/heap/object-stats.cc @@ -16,6 +16,7 @@ #include "src/heap/mark-compact.h" #include "src/isolate.h" #include "src/objects/compilation-cache-inl.h" +#include "src/objects/js-collection-inl.h" #include "src/objects/templates.h" #include "src/utils.h" diff --git a/src/heap/setup-heap-internal.cc b/src/heap/setup-heap-internal.cc index 3b232ba310..53dd02217f 100644 --- a/src/heap/setup-heap-internal.cc +++ b/src/heap/setup-heap-internal.cc @@ -22,7 +22,9 @@ #include "src/objects/descriptor-array.h" #include "src/objects/dictionary.h" #include "src/objects/map.h" +#include "src/objects/microtask.h" #include "src/objects/module.h" +#include "src/objects/promise.h" #include "src/objects/script.h" #include "src/objects/shared-function-info.h" #include "src/objects/string.h" diff --git a/src/ic/accessor-assembler.cc b/src/ic/accessor-assembler.cc index 1a7d96931e..8df07ee5ef 100644 --- a/src/ic/accessor-assembler.cc +++ b/src/ic/accessor-assembler.cc @@ -11,6 +11,7 @@ #include "src/ic/ic.h" #include "src/ic/stub-cache.h" #include "src/objects-inl.h" +#include "src/objects/module.h" namespace v8 { namespace internal { diff --git a/src/ic/ic.cc b/src/ic/ic.cc index 1455d4888b..561a54078a 100644 --- a/src/ic/ic.cc +++ b/src/ic/ic.cc @@ -22,6 +22,7 @@ #include "src/macro-assembler.h" #include "src/objects/api-callbacks.h" #include "src/objects/hash-table-inl.h" +#include "src/objects/module-inl.h" #include "src/prototype.h" #include "src/runtime-profiler.h" #include "src/runtime/runtime-utils.h" diff --git a/src/interpreter/interpreter-generator.cc b/src/interpreter/interpreter-generator.cc index 5be7656bef..fd71c87659 100644 --- a/src/interpreter/interpreter-generator.cc +++ b/src/interpreter/interpreter-generator.cc @@ -19,6 +19,7 @@ #include "src/interpreter/interpreter-assembler.h" #include "src/interpreter/interpreter-intrinsics-generator.h" #include "src/objects-inl.h" +#include "src/objects/module.h" namespace v8 { namespace internal { diff --git a/src/isolate.cc b/src/isolate.cc index 5321a32ae6..2ed3d0a5ad 100644 --- a/src/isolate.cc +++ b/src/isolate.cc @@ -42,6 +42,7 @@ #include "src/messages.h" #include "src/objects/frame-array-inl.h" #include "src/objects/hash-table-inl.h" +#include "src/objects/module-inl.h" #include "src/objects/promise-inl.h" #include "src/profiler/cpu-profiler.h" #include "src/profiler/tracing-cpu-profiler.h" diff --git a/src/keys.cc b/src/keys.cc index 296736d7f4..1fd20d2ae4 100644 --- a/src/keys.cc +++ b/src/keys.cc @@ -12,6 +12,7 @@ #include "src/objects-inl.h" #include "src/objects/api-callbacks.h" #include "src/objects/hash-table-inl.h" +#include "src/objects/module-inl.h" #include "src/property-descriptor.h" #include "src/prototype.h" diff --git a/src/objects-body-descriptors-inl.h b/src/objects-body-descriptors-inl.h index 0d25ad8886..16b1513a8c 100644 --- a/src/objects-body-descriptors-inl.h +++ b/src/objects-body-descriptors-inl.h @@ -9,6 +9,7 @@ #include "src/feedback-vector.h" #include "src/objects-body-descriptors.h" #include "src/objects/hash-table.h" +#include "src/objects/js-collection.h" #include "src/transitions.h" #include "src/wasm/wasm-objects-inl.h" diff --git a/src/objects-debug.cc b/src/objects-debug.cc index b0e078b1db..51f477d11d 100644 --- a/src/objects-debug.cc +++ b/src/objects-debug.cc @@ -13,17 +13,21 @@ #include "src/layout-descriptor.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" +#include "src/objects/arguments-inl.h" #include "src/objects/bigint.h" #include "src/objects/data-handler-inl.h" #include "src/objects/debug-objects-inl.h" #include "src/objects/hash-table-inl.h" +#include "src/objects/js-collection-inl.h" #include "src/objects/literal-objects.h" #ifdef V8_INTL_SUPPORT #include "src/objects/js-locale-inl.h" #endif // V8_INTL_SUPPORT +#include "src/objects/js-regexp-inl.h" +#include "src/objects/js-regexp-string-iterator-inl.h" #include "src/objects/maybe-object.h" #include "src/objects/microtask-inl.h" -#include "src/objects/module.h" +#include "src/objects/module-inl.h" #include "src/objects/promise-inl.h" #include "src/ostreams.h" #include "src/regexp/jsregexp.h" diff --git a/src/objects-inl.h b/src/objects-inl.h index 2026f6db08..0b19590259 100644 --- a/src/objects-inl.h +++ b/src/objects-inl.h @@ -30,20 +30,9 @@ #include "src/layout-descriptor-inl.h" #include "src/lookup-cache-inl.h" #include "src/lookup.h" -#include "src/objects/arguments-inl.h" #include "src/objects/bigint.h" -#include "src/objects/data-handler-inl.h" #include "src/objects/descriptor-array.h" -#include "src/objects/fixed-array-inl.h" -#include "src/objects/js-array-inl.h" -#include "src/objects/js-collection-inl.h" -#include "src/objects/js-promise-inl.h" -#include "src/objects/js-regexp-inl.h" -#include "src/objects/js-regexp-string-iterator-inl.h" #include "src/objects/literal-objects.h" -#include "src/objects/map-inl.h" -#include "src/objects/module-inl.h" -#include "src/objects/name-inl.h" #include "src/objects/regexp-match-info.h" #include "src/objects/scope-info.h" #include "src/objects/template-objects.h" @@ -84,17 +73,28 @@ TYPE_CHECKER(BigInt, BIGINT_TYPE) TYPE_CHECKER(BoilerplateDescription, BOILERPLATE_DESCRIPTION_TYPE) TYPE_CHECKER(BreakPoint, TUPLE2_TYPE) TYPE_CHECKER(BreakPointInfo, TUPLE2_TYPE) +TYPE_CHECKER(ByteArray, BYTE_ARRAY_TYPE) +TYPE_CHECKER(BytecodeArray, BYTECODE_ARRAY_TYPE) +TYPE_CHECKER(CallHandlerInfo, CALL_HANDLER_INFO_TYPE) TYPE_CHECKER(Cell, CELL_TYPE) +TYPE_CHECKER(Code, CODE_TYPE) +TYPE_CHECKER(CodeDataContainer, CODE_DATA_CONTAINER_TYPE) TYPE_CHECKER(ConstantElementsPair, TUPLE2_TYPE) TYPE_CHECKER(CoverageInfo, FIXED_ARRAY_TYPE) TYPE_CHECKER(DescriptorArray, DESCRIPTOR_ARRAY_TYPE) TYPE_CHECKER(FeedbackCell, FEEDBACK_CELL_TYPE) TYPE_CHECKER(FeedbackMetadata, FEEDBACK_METADATA_TYPE) TYPE_CHECKER(FeedbackVector, FEEDBACK_VECTOR_TYPE) +TYPE_CHECKER(FixedArrayExact, FIXED_ARRAY_TYPE) +TYPE_CHECKER(FixedArrayOfWeakCells, FIXED_ARRAY_TYPE) +TYPE_CHECKER(FixedDoubleArray, FIXED_DOUBLE_ARRAY_TYPE) TYPE_CHECKER(Foreign, FOREIGN_TYPE) TYPE_CHECKER(FreeSpace, FREE_SPACE_TYPE) TYPE_CHECKER(HashTable, HASH_TABLE_TYPE) TYPE_CHECKER(HeapNumber, HEAP_NUMBER_TYPE) +TYPE_CHECKER(JSArgumentsObject, JS_ARGUMENTS_TYPE) +TYPE_CHECKER(JSArray, JS_ARRAY_TYPE) +TYPE_CHECKER(JSArrayBuffer, JS_ARRAY_BUFFER_TYPE) TYPE_CHECKER(JSArrayIterator, JS_ARRAY_ITERATOR_TYPE) TYPE_CHECKER(JSAsyncFromSyncIterator, JS_ASYNC_FROM_SYNC_ITERATOR_TYPE) TYPE_CHECKER(JSAsyncGeneratorObject, JS_ASYNC_GENERATOR_OBJECT_TYPE) @@ -105,12 +105,19 @@ TYPE_CHECKER(JSDate, JS_DATE_TYPE) TYPE_CHECKER(JSError, JS_ERROR_TYPE) TYPE_CHECKER(JSFunction, JS_FUNCTION_TYPE) TYPE_CHECKER(JSGlobalObject, JS_GLOBAL_OBJECT_TYPE) -#ifdef V8_INTL_SUPPORT -TYPE_CHECKER(JSLocale, JS_INTL_LOCALE_TYPE) -#endif // V8_INTL_SUPPORT +TYPE_CHECKER(JSMap, JS_MAP_TYPE) TYPE_CHECKER(JSMessageObject, JS_MESSAGE_OBJECT_TYPE) +TYPE_CHECKER(JSModuleNamespace, JS_MODULE_NAMESPACE_TYPE) +TYPE_CHECKER(JSPromise, JS_PROMISE_TYPE) +TYPE_CHECKER(JSRegExp, JS_REGEXP_TYPE) +TYPE_CHECKER(JSRegExpStringIterator, JS_REGEXP_STRING_ITERATOR_TYPE) +TYPE_CHECKER(JSSet, JS_SET_TYPE) TYPE_CHECKER(JSStringIterator, JS_STRING_ITERATOR_TYPE) +TYPE_CHECKER(JSTypedArray, JS_TYPED_ARRAY_TYPE) TYPE_CHECKER(JSValue, JS_VALUE_TYPE) +TYPE_CHECKER(JSWeakMap, JS_WEAK_MAP_TYPE) +TYPE_CHECKER(JSWeakSet, JS_WEAK_SET_TYPE) +TYPE_CHECKER(Map, MAP_TYPE) TYPE_CHECKER(MutableHeapNumber, MUTABLE_HEAP_NUMBER_TYPE) TYPE_CHECKER(Oddball, ODDBALL_TYPE) TYPE_CHECKER(PreParsedScopeData, TUPLE2_TYPE) @@ -118,9 +125,11 @@ TYPE_CHECKER(PropertyArray, PROPERTY_ARRAY_TYPE) TYPE_CHECKER(PropertyCell, PROPERTY_CELL_TYPE) TYPE_CHECKER(PropertyDescriptorObject, FIXED_ARRAY_TYPE) TYPE_CHECKER(ScopeInfo, SCOPE_INFO_TYPE) +TYPE_CHECKER(SharedFunctionInfo, SHARED_FUNCTION_INFO_TYPE) TYPE_CHECKER(SmallOrderedHashMap, SMALL_ORDERED_HASH_MAP_TYPE) TYPE_CHECKER(SmallOrderedHashSet, SMALL_ORDERED_HASH_SET_TYPE) TYPE_CHECKER(SourcePositionTableWithFrameCache, TUPLE2_TYPE) +TYPE_CHECKER(Symbol, SYMBOL_TYPE) TYPE_CHECKER(TemplateObjectDescription, TUPLE2_TYPE) TYPE_CHECKER(TransitionArray, TRANSITION_ARRAY_TYPE) TYPE_CHECKER(WasmGlobalObject, WASM_GLOBAL_TYPE) @@ -128,8 +137,13 @@ TYPE_CHECKER(WasmInstanceObject, WASM_INSTANCE_TYPE) TYPE_CHECKER(WasmMemoryObject, WASM_MEMORY_TYPE) TYPE_CHECKER(WasmModuleObject, WASM_MODULE_TYPE) TYPE_CHECKER(WasmTableObject, WASM_TABLE_TYPE) +TYPE_CHECKER(WeakArrayList, WEAK_ARRAY_LIST_TYPE) TYPE_CHECKER(WeakCell, WEAK_CELL_TYPE) +#ifdef V8_INTL_SUPPORT +TYPE_CHECKER(JSLocale, JS_INTL_LOCALE_TYPE) +#endif // V8_INTL_SUPPORT + #define TYPED_ARRAY_TYPE_CHECKER(Type, type, TYPE, ctype, size) \ TYPE_CHECKER(Fixed##Type##Array, FIXED_##TYPE##_ARRAY_TYPE) TYPED_ARRAYS(TYPED_ARRAY_TYPE_CHECKER) @@ -219,6 +233,10 @@ bool HeapObject::IsCallable() const { return map()->is_callable(); } bool HeapObject::IsConstructor() const { return map()->is_constructor(); } +bool HeapObject::IsModuleInfo() const { + return map() == GetHeap()->module_info_map(); +} + bool HeapObject::IsTemplateInfo() const { return IsObjectTemplateInfo() || IsFunctionTemplateInfo(); } diff --git a/src/objects-printer.cc b/src/objects-printer.cc index 67cb9dbb45..45ac108bd0 100644 --- a/src/objects-printer.cc +++ b/src/objects-printer.cc @@ -16,7 +16,12 @@ #ifdef V8_INTL_SUPPORT #include "src/objects/js-locale-inl.h" #endif // V8_INTL_SUPPORT +#include "src/objects/arguments-inl.h" +#include "src/objects/js-collection-inl.h" +#include "src/objects/js-regexp-inl.h" +#include "src/objects/js-regexp-string-iterator-inl.h" #include "src/objects/microtask-inl.h" +#include "src/objects/module-inl.h" #include "src/objects/promise-inl.h" #include "src/ostreams.h" #include "src/regexp/jsregexp.h" diff --git a/src/objects.cc b/src/objects.cc index 04eaa63a80..461091b2c1 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -54,6 +54,7 @@ #include "src/messages.h" #include "src/objects-body-descriptors-inl.h" #include "src/objects/api-callbacks.h" +#include "src/objects/arguments-inl.h" #include "src/objects/bigint.h" #include "src/objects/code-inl.h" #include "src/objects/compilation-cache-inl.h" @@ -63,9 +64,12 @@ #ifdef V8_INTL_SUPPORT #include "src/objects/js-locale.h" #endif // V8_INTL_SUPPORT +#include "src/objects/js-collection-inl.h" +#include "src/objects/js-regexp-inl.h" #include "src/objects/js-regexp-string-iterator.h" #include "src/objects/map.h" #include "src/objects/microtask-inl.h" +#include "src/objects/module-inl.h" #include "src/objects/promise-inl.h" #include "src/parsing/preparsed-scope-data.h" #include "src/property-descriptor.h" diff --git a/src/objects/api-callbacks-inl.h b/src/objects/api-callbacks-inl.h index 77fb8bb63a..6ffa59ad71 100644 --- a/src/objects/api-callbacks-inl.h +++ b/src/objects/api-callbacks-inl.h @@ -22,8 +22,6 @@ CAST_ACCESSOR(AccessCheckInfo) CAST_ACCESSOR(InterceptorInfo) CAST_ACCESSOR(CallHandlerInfo) -TYPE_CHECKER(CallHandlerInfo, CALL_HANDLER_INFO_TYPE) - ACCESSORS(AccessorInfo, name, Name, kNameOffset) SMI_ACCESSORS(AccessorInfo, flags, kFlagsOffset) ACCESSORS(AccessorInfo, expected_receiver_type, Object, diff --git a/src/objects/arguments-inl.h b/src/objects/arguments-inl.h index d759c7dab2..22f9837478 100644 --- a/src/objects/arguments-inl.h +++ b/src/objects/arguments-inl.h @@ -19,8 +19,6 @@ CAST_ACCESSOR(SloppyArgumentsElements) SMI_ACCESSORS(AliasedArgumentsEntry, aliased_context_slot, kAliasedContextSlot) -TYPE_CHECKER(JSArgumentsObject, JS_ARGUMENTS_TYPE) - Context* SloppyArgumentsElements::context() { return Context::cast(get(kContextIndex)); } diff --git a/src/objects/code-inl.h b/src/objects/code-inl.h index e484003ba8..815ad38435 100644 --- a/src/objects/code-inl.h +++ b/src/objects/code-inl.h @@ -19,10 +19,6 @@ namespace v8 { namespace internal { -TYPE_CHECKER(BytecodeArray, BYTECODE_ARRAY_TYPE) -TYPE_CHECKER(Code, CODE_TYPE) -TYPE_CHECKER(CodeDataContainer, CODE_DATA_CONTAINER_TYPE) - CAST_ACCESSOR(AbstractCode) CAST_ACCESSOR(BytecodeArray) CAST_ACCESSOR(Code) diff --git a/src/objects/fixed-array-inl.h b/src/objects/fixed-array-inl.h index 1de1079717..030bdc1866 100644 --- a/src/objects/fixed-array-inl.h +++ b/src/objects/fixed-array-inl.h @@ -5,7 +5,9 @@ #ifndef V8_OBJECTS_FIXED_ARRAY_INL_H_ #define V8_OBJECTS_FIXED_ARRAY_INL_H_ -#include "src/objects.h" +#include "src/objects/fixed-array.h" + +#include "src/objects/bigint.h" // Has to be the last include (doesn't have include guards): #include "src/objects/object-macros.h" @@ -13,12 +15,6 @@ namespace v8 { namespace internal { -TYPE_CHECKER(ByteArray, BYTE_ARRAY_TYPE) -TYPE_CHECKER(FixedArrayExact, FIXED_ARRAY_TYPE) -TYPE_CHECKER(FixedDoubleArray, FIXED_DOUBLE_ARRAY_TYPE) -TYPE_CHECKER(FixedArrayOfWeakCells, FIXED_ARRAY_TYPE) -TYPE_CHECKER(WeakArrayList, WEAK_ARRAY_LIST_TYPE) - CAST_ACCESSOR(ArrayList) CAST_ACCESSOR(ByteArray) CAST_ACCESSOR(FixedArray) diff --git a/src/objects/js-array-inl.h b/src/objects/js-array-inl.h index 2500acfe98..fd34addb12 100644 --- a/src/objects/js-array-inl.h +++ b/src/objects/js-array-inl.h @@ -14,10 +14,6 @@ namespace v8 { namespace internal { -TYPE_CHECKER(JSArray, JS_ARRAY_TYPE) -TYPE_CHECKER(JSArrayBuffer, JS_ARRAY_BUFFER_TYPE) -TYPE_CHECKER(JSTypedArray, JS_TYPED_ARRAY_TYPE) - CAST_ACCESSOR(JSArray) CAST_ACCESSOR(JSArrayBuffer) CAST_ACCESSOR(JSArrayBufferView) diff --git a/src/objects/js-collection-inl.h b/src/objects/js-collection-inl.h index 7ad24bcf12..a9a455ad08 100644 --- a/src/objects/js-collection-inl.h +++ b/src/objects/js-collection-inl.h @@ -20,11 +20,6 @@ ACCESSORS(JSCollectionIterator, index, Object, kIndexOffset) ACCESSORS(JSWeakCollection, table, Object, kTableOffset) ACCESSORS(JSWeakCollection, next, Object, kNextOffset) -TYPE_CHECKER(JSMap, JS_MAP_TYPE) -TYPE_CHECKER(JSSet, JS_SET_TYPE) -TYPE_CHECKER(JSWeakMap, JS_WEAK_MAP_TYPE) -TYPE_CHECKER(JSWeakSet, JS_WEAK_SET_TYPE) - CAST_ACCESSOR(JSSet) CAST_ACCESSOR(JSSetIterator) CAST_ACCESSOR(JSMap) diff --git a/src/objects/js-promise-inl.h b/src/objects/js-promise-inl.h index afe297b880..3eb1a4fff1 100644 --- a/src/objects/js-promise-inl.h +++ b/src/objects/js-promise-inl.h @@ -14,7 +14,6 @@ namespace v8 { namespace internal { -TYPE_CHECKER(JSPromise, JS_PROMISE_TYPE) CAST_ACCESSOR(JSPromise) ACCESSORS(JSPromise, reactions_or_result, Object, kReactionsOrResultOffset) diff --git a/src/objects/js-regexp-inl.h b/src/objects/js-regexp-inl.h index 697c81eb42..66156157a3 100644 --- a/src/objects/js-regexp-inl.h +++ b/src/objects/js-regexp-inl.h @@ -15,8 +15,6 @@ namespace v8 { namespace internal { -TYPE_CHECKER(JSRegExp, JS_REGEXP_TYPE) - CAST_ACCESSOR(JSRegExp) ACCESSORS(JSRegExp, data, Object, kDataOffset) diff --git a/src/objects/js-regexp-string-iterator-inl.h b/src/objects/js-regexp-string-iterator-inl.h index 1d6a64ec0c..ca099d48e5 100644 --- a/src/objects/js-regexp-string-iterator-inl.h +++ b/src/objects/js-regexp-string-iterator-inl.h @@ -13,8 +13,6 @@ namespace v8 { namespace internal { -TYPE_CHECKER(JSRegExpStringIterator, JS_REGEXP_STRING_ITERATOR_TYPE) - ACCESSORS(JSRegExpStringIterator, iterating_regexp, Object, kIteratingRegExpOffset) ACCESSORS(JSRegExpStringIterator, iterating_string, String, diff --git a/src/objects/map-inl.h b/src/objects/map-inl.h index 696dea91ea..75ddd33956 100644 --- a/src/objects/map-inl.h +++ b/src/objects/map-inl.h @@ -70,8 +70,6 @@ BIT_FIELD_ACCESSORS(Map, bit_field3, may_have_interesting_symbols, BIT_FIELD_ACCESSORS(Map, bit_field3, construction_counter, Map::ConstructionCounterBits) -TYPE_CHECKER(Map, MAP_TYPE) - InterceptorInfo* Map::GetNamedInterceptor() { DCHECK(has_named_interceptor()); FunctionTemplateInfo* info = GetFunctionTemplateInfo(); diff --git a/src/objects/module-inl.h b/src/objects/module-inl.h index 02202ad72c..201804b595 100644 --- a/src/objects/module-inl.h +++ b/src/objects/module-inl.h @@ -35,7 +35,6 @@ ModuleInfo* Module::info() const { : GetSharedFunctionInfo()->scope_info()->ModuleDescriptorInfo(); } -TYPE_CHECKER(JSModuleNamespace, JS_MODULE_NAMESPACE_TYPE) CAST_ACCESSOR(JSModuleNamespace) ACCESSORS(JSModuleNamespace, module, Module, kModuleOffset) @@ -50,10 +49,6 @@ SMI_ACCESSORS(ModuleInfoEntry, end_pos, kEndPosOffset) CAST_ACCESSOR(ModuleInfo) -bool HeapObject::IsModuleInfo() const { - return map() == GetHeap()->module_info_map(); -} - } // namespace internal } // namespace v8 diff --git a/src/objects/module.cc b/src/objects/module.cc index f1f9955946..53ae16cb9a 100644 --- a/src/objects/module.cc +++ b/src/objects/module.cc @@ -12,6 +12,7 @@ #include "src/ast/modules.h" #include "src/objects-inl.h" #include "src/objects/hash-table-inl.h" +#include "src/objects/module-inl.h" namespace v8 { namespace internal { diff --git a/src/objects/name-inl.h b/src/objects/name-inl.h index b4ebeb632b..891855de43 100644 --- a/src/objects/name-inl.h +++ b/src/objects/name-inl.h @@ -25,8 +25,6 @@ BOOL_ACCESSORS(Symbol, flags, is_well_known_symbol, kWellKnownSymbolBit) BOOL_ACCESSORS(Symbol, flags, is_public, kPublicBit) BOOL_ACCESSORS(Symbol, flags, is_interesting_symbol, kInterestingSymbolBit) -TYPE_CHECKER(Symbol, SYMBOL_TYPE) - bool Symbol::is_private_field() const { bool value = BooleanBit::get(flags(), kPrivateFieldBit); DCHECK_IMPLIES(value, is_private()); diff --git a/src/objects/ordered-hash-table.cc b/src/objects/ordered-hash-table.cc index be4d473743..e8978bb285 100644 --- a/src/objects/ordered-hash-table.cc +++ b/src/objects/ordered-hash-table.cc @@ -6,6 +6,7 @@ #include "src/isolate.h" #include "src/objects-inl.h" +#include "src/objects/js-collection-inl.h" #include "src/objects/ordered-hash-table-inl.h" namespace v8 { diff --git a/src/objects/promise-inl.h b/src/objects/promise-inl.h index f9fb6110f3..f33bc42681 100644 --- a/src/objects/promise-inl.h +++ b/src/objects/promise-inl.h @@ -5,6 +5,7 @@ #ifndef V8_OBJECTS_PROMISE_INL_H_ #define V8_OBJECTS_PROMISE_INL_H_ +#include "src/objects/js-promise-inl.h" #include "src/objects/promise.h" // Has to be the last include (doesn't have include guards): diff --git a/src/objects/scope-info.cc b/src/objects/scope-info.cc index 479d7b3ca4..76d2fac745 100644 --- a/src/objects/scope-info.cc +++ b/src/objects/scope-info.cc @@ -10,7 +10,9 @@ #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" namespace v8 { namespace internal { diff --git a/src/objects/shared-function-info-inl.h b/src/objects/shared-function-info-inl.h index e3cfd69fc5..2116947d1a 100644 --- a/src/objects/shared-function-info-inl.h +++ b/src/objects/shared-function-info-inl.h @@ -26,7 +26,6 @@ ACCESSORS(InterpreterData, bytecode_array, BytecodeArray, kBytecodeArrayOffset) ACCESSORS(InterpreterData, interpreter_trampoline, Code, kInterpreterTrampolineOffset) -TYPE_CHECKER(SharedFunctionInfo, SHARED_FUNCTION_INFO_TYPE) CAST_ACCESSOR(SharedFunctionInfo) DEFINE_DEOPT_ELEMENT_ACCESSORS(SharedFunctionInfo, Object) diff --git a/src/profiler/heap-snapshot-generator.cc b/src/profiler/heap-snapshot-generator.cc index 841d4e16e5..d438cc72f4 100644 --- a/src/profiler/heap-snapshot-generator.cc +++ b/src/profiler/heap-snapshot-generator.cc @@ -16,6 +16,9 @@ #include "src/objects-inl.h" #include "src/objects/api-callbacks.h" #include "src/objects/hash-table-inl.h" +#include "src/objects/js-collection-inl.h" +#include "src/objects/js-promise-inl.h" +#include "src/objects/js-regexp-inl.h" #include "src/profiler/allocation-tracker.h" #include "src/profiler/heap-profiler.h" #include "src/profiler/heap-snapshot-generator-inl.h" diff --git a/src/regexp/jsregexp-inl.h b/src/regexp/jsregexp-inl.h index 1266da3209..b4ac90da7d 100644 --- a/src/regexp/jsregexp-inl.h +++ b/src/regexp/jsregexp-inl.h @@ -8,6 +8,7 @@ #include "src/allocation.h" #include "src/objects.h" +#include "src/objects/js-regexp-inl.h" #include "src/regexp/jsregexp.h" namespace v8 { diff --git a/src/regexp/regexp-utils.cc b/src/regexp/regexp-utils.cc index 0857342c0c..7e0fb194ab 100644 --- a/src/regexp/regexp-utils.cc +++ b/src/regexp/regexp-utils.cc @@ -7,6 +7,7 @@ #include "src/heap/factory.h" #include "src/isolate.h" #include "src/objects-inl.h" +#include "src/objects/js-regexp-inl.h" #include "src/regexp/jsregexp.h" namespace v8 { diff --git a/src/runtime/runtime-array.cc b/src/runtime/runtime-array.cc index 648359c64b..b0a9ae8526 100644 --- a/src/runtime/runtime-array.cc +++ b/src/runtime/runtime-array.cc @@ -13,6 +13,7 @@ #include "src/isolate-inl.h" #include "src/keys.h" #include "src/messages.h" +#include "src/objects/arguments-inl.h" #include "src/objects/hash-table-inl.h" #include "src/prototype.h" diff --git a/src/runtime/runtime-collections.cc b/src/runtime/runtime-collections.cc index 92ee880719..ee79c3df94 100644 --- a/src/runtime/runtime-collections.cc +++ b/src/runtime/runtime-collections.cc @@ -8,6 +8,7 @@ #include "src/conversions-inl.h" #include "src/heap/factory.h" #include "src/objects/hash-table-inl.h" +#include "src/objects/js-collection-inl.h" namespace v8 { namespace internal { diff --git a/src/runtime/runtime-debug.cc b/src/runtime/runtime-debug.cc index fabb1a80da..2de83d0fdb 100644 --- a/src/runtime/runtime-debug.cc +++ b/src/runtime/runtime-debug.cc @@ -21,6 +21,8 @@ #include "src/interpreter/interpreter.h" #include "src/isolate-inl.h" #include "src/objects/debug-objects-inl.h" +#include "src/objects/js-collection-inl.h" +#include "src/objects/js-promise-inl.h" #include "src/runtime/runtime.h" #include "src/snapshot/snapshot.h" #include "src/wasm/wasm-objects-inl.h" diff --git a/src/runtime/runtime-forin.cc b/src/runtime/runtime-forin.cc index 9193daf9db..cbfef81af9 100644 --- a/src/runtime/runtime-forin.cc +++ b/src/runtime/runtime-forin.cc @@ -10,6 +10,7 @@ #include "src/isolate-inl.h" #include "src/keys.h" #include "src/objects-inl.h" +#include "src/objects/module.h" namespace v8 { namespace internal { diff --git a/src/runtime/runtime-literals.cc b/src/runtime/runtime-literals.cc index 71e91bab35..24a51171ab 100644 --- a/src/runtime/runtime-literals.cc +++ b/src/runtime/runtime-literals.cc @@ -10,6 +10,7 @@ #include "src/ast/compile-time-value.h" #include "src/isolate-inl.h" #include "src/objects/hash-table-inl.h" +#include "src/objects/js-regexp-inl.h" #include "src/runtime/runtime.h" namespace v8 { diff --git a/src/runtime/runtime-module.cc b/src/runtime/runtime-module.cc index a758050306..be8e3448d0 100644 --- a/src/runtime/runtime-module.cc +++ b/src/runtime/runtime-module.cc @@ -7,6 +7,8 @@ #include "src/arguments.h" #include "src/counters.h" #include "src/objects-inl.h" +#include "src/objects/js-promise.h" +#include "src/objects/module.h" namespace v8 { namespace internal { diff --git a/src/runtime/runtime-promise.cc b/src/runtime/runtime-promise.cc index f5b9db3c02..5343c4caf4 100644 --- a/src/runtime/runtime-promise.cc +++ b/src/runtime/runtime-promise.cc @@ -10,6 +10,7 @@ #include "src/debug/debug.h" #include "src/elements.h" #include "src/objects-inl.h" +#include "src/objects/js-promise-inl.h" namespace v8 { namespace internal { diff --git a/src/runtime/runtime-scopes.cc b/src/runtime/runtime-scopes.cc index b13d52bceb..a12add987c 100644 --- a/src/runtime/runtime-scopes.cc +++ b/src/runtime/runtime-scopes.cc @@ -14,6 +14,7 @@ #include "src/frames-inl.h" #include "src/isolate-inl.h" #include "src/messages.h" +#include "src/objects/module-inl.h" namespace v8 { namespace internal { diff --git a/src/value-serializer.cc b/src/value-serializer.cc index 9fb678f84f..75c7a462c2 100644 --- a/src/value-serializer.cc +++ b/src/value-serializer.cc @@ -15,6 +15,8 @@ #include "src/heap/factory.h" #include "src/isolate.h" #include "src/objects-inl.h" +#include "src/objects/js-collection-inl.h" +#include "src/objects/js-regexp-inl.h" #include "src/objects/ordered-hash-table-inl.h" #include "src/snapshot/code-serializer.h" #include "src/transitions.h" diff --git a/src/wasm/wasm-engine.cc b/src/wasm/wasm-engine.cc index 13dc4edb75..8a4a05d465 100644 --- a/src/wasm/wasm-engine.cc +++ b/src/wasm/wasm-engine.cc @@ -5,6 +5,7 @@ #include "src/wasm/wasm-engine.h" #include "src/objects-inl.h" +#include "src/objects/js-promise.h" #include "src/wasm/module-compiler.h" #include "src/wasm/module-decoder.h" #include "src/wasm/streaming-decoder.h" diff --git a/test/cctest/heap/test-heap.cc b/test/cctest/heap/test-heap.cc index ef271d6700..c6dd2e67e7 100644 --- a/test/cctest/heap/test-heap.cc +++ b/test/cctest/heap/test-heap.cc @@ -46,6 +46,7 @@ #include "src/ic/ic.h" #include "src/macro-assembler-inl.h" #include "src/objects-inl.h" +#include "src/objects/js-collection-inl.h" #include "src/regexp/jsregexp.h" #include "src/snapshot/snapshot.h" #include "src/transitions.h" diff --git a/test/cctest/interpreter/bytecode-expectations-printer.cc b/test/cctest/interpreter/bytecode-expectations-printer.cc index 480129cb70..0998b3dfd9 100644 --- a/test/cctest/interpreter/bytecode-expectations-printer.cc +++ b/test/cctest/interpreter/bytecode-expectations-printer.cc @@ -10,17 +10,16 @@ #include "include/libplatform/libplatform.h" #include "include/v8.h" - #include "src/api.h" #include "src/base/logging.h" -#include "src/objects-inl.h" -#include "src/runtime/runtime.h" - #include "src/interpreter/bytecode-array-iterator.h" #include "src/interpreter/bytecode-generator.h" #include "src/interpreter/bytecodes.h" #include "src/interpreter/interpreter-intrinsics.h" #include "src/interpreter/interpreter.h" +#include "src/objects-inl.h" +#include "src/objects/module-inl.h" +#include "src/runtime/runtime.h" #include "src/source-position-table.h" namespace v8 { diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc index 14732352c2..7907e6e37c 100644 --- a/test/cctest/test-api.cc +++ b/test/cctest/test-api.cc @@ -52,6 +52,7 @@ #include "src/lookup.h" #include "src/objects-inl.h" #include "src/objects/hash-table-inl.h" +#include "src/objects/js-promise-inl.h" #include "src/parsing/preparse-data.h" #include "src/profiler/cpu-profiler.h" #include "src/unicode-inl.h" diff --git a/test/cctest/test-weakmaps.cc b/test/cctest/test-weakmaps.cc index f82fc1ab75..14bc042871 100644 --- a/test/cctest/test-weakmaps.cc +++ b/test/cctest/test-weakmaps.cc @@ -32,6 +32,7 @@ #include "src/isolate.h" #include "src/objects-inl.h" #include "src/objects/hash-table-inl.h" +#include "src/objects/js-collection-inl.h" #include "test/cctest/cctest.h" #include "test/cctest/heap/heap-utils.h" diff --git a/test/cctest/test-weaksets.cc b/test/cctest/test-weaksets.cc index 5a5dfeeee6..5d8e27dd5c 100644 --- a/test/cctest/test-weaksets.cc +++ b/test/cctest/test-weaksets.cc @@ -32,6 +32,7 @@ #include "src/isolate.h" #include "src/objects-inl.h" #include "src/objects/hash-table-inl.h" +#include "src/objects/js-collection-inl.h" #include "test/cctest/cctest.h" #include "test/cctest/heap/heap-utils.h" diff --git a/test/unittests/compiler/js-create-lowering-unittest.cc b/test/unittests/compiler/js-create-lowering-unittest.cc index 468d593551..3c15c606a4 100644 --- a/test/unittests/compiler/js-create-lowering-unittest.cc +++ b/test/unittests/compiler/js-create-lowering-unittest.cc @@ -13,6 +13,7 @@ #include "src/compiler/operator-properties.h" #include "src/feedback-vector.h" #include "src/isolate-inl.h" +#include "src/objects/arguments.h" #include "test/unittests/compiler/compiler-test-utils.h" #include "test/unittests/compiler/graph-unittest.h" #include "test/unittests/compiler/node-test-utils.h" diff --git a/tools/gen-postmortem-metadata.py b/tools/gen-postmortem-metadata.py index 97f2ac9c63..f95efa8936 100644 --- a/tools/gen-postmortem-metadata.py +++ b/tools/gen-postmortem-metadata.py @@ -306,6 +306,8 @@ header = ''' #include "src/frames.h" #include "src/frames-inl.h" /* for architecture-specific frame constants */ #include "src/contexts.h" +#include "src/objects.h" +#include "src/objects/js-regexp-string-iterator.h" using namespace v8::internal;