Reland "[torque] refactor: use -tq only in filenames derived from .tq files"

This is a reland of 64caf2b0b2

Original change's description:
> [torque] refactor: use -tq only in filenames derived from .tq files
>
> This is to establish a naming rule for Torque-generated files:
> - If the file is called foo/bar-tq..., then it is derived from a
>   file foo/bar.tq
> - Otherwise it doesn't belong to a specific .tq file.
>
> So far, we attached -tq to all Torque-generated file names, where it
> sometimes corresponded to a .tq file name and sometimes not.
> It is not necessary to add -tq to file names to indicate that they are
> Torque-generated, since they are already in a directory called
> torque-generated, and we always refer to them as
> "torque-generated/filename", so there is no confusion even though some
> files now have the same name as a corresponding hand-written file, for
> example factory.cc.
>
> TBR: hpayer@chromium.org
> Bug: v8:7793
> Change-Id: Ie172babad1fc7422fd1059c48f5dafaa53e50c8b
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2414218
> Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
> Reviewed-by: Jakob Gruber <jgruber@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#70060}

Bug: v8:7793
TBR: hpayer@chromium.org jgruber@chromium.org
Change-Id: I6c492bc64aee1ff167e7ef401825eca9097a7f38
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2431565
Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
Reviewed-by: Tobias Tebbi <tebbi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#70137}
This commit is contained in:
Tobias Tebbi 2020-09-25 16:11:33 +02:00 committed by Commit Bot
parent 2089b45adb
commit 21b585165f
81 changed files with 177 additions and 182 deletions

View File

@ -1039,7 +1039,7 @@ action("postmortem-metadata") {
# NOSORT
sources = [
"$target_gen_dir/torque-generated/instance-types-tq.h",
"$target_gen_dir/torque-generated/instance-types.h",
"src/objects/allocation-site.h",
"src/objects/allocation-site-inl.h",
"src/objects/cell.h",
@ -1318,35 +1318,37 @@ template("run_torque") {
destination_folder = "$target_gen_dir/torque-generated$suffix"
files = [
"bit-fields-tq.h",
"builtin-definitions-tq.h",
"interface-descriptors-tq.inc",
"factory-tq.cc",
"factory-tq.inc",
"field-offsets-tq.h",
"class-verifiers-tq.cc",
"class-verifiers-tq.h",
"enum-verifiers-tq.cc",
"objects-printer-tq.cc",
"objects-body-descriptors-tq-inl.inc",
"class-definitions-tq.cc",
"class-definitions-tq-inl.h",
"class-definitions-tq.h",
"class-debug-readers-tq.cc",
"class-debug-readers-tq.h",
"exported-macros-assembler-tq.cc",
"exported-macros-assembler-tq.h",
"csa-types-tq.h",
"instance-types-tq.h",
"internal-class-definitions-tq.h",
"internal-class-definitions-tq-inl.h",
"exported-class-definitions-tq.h",
"exported-class-definitions-tq-inl.h",
"$target_gen_dir/torque-generated/bit-fields.h",
"$target_gen_dir/torque-generated/builtin-definitions.h",
"$target_gen_dir/torque-generated/interface-descriptors.inc",
"$target_gen_dir/torque-generated/factory.cc",
"$target_gen_dir/torque-generated/factory.inc",
"$target_gen_dir/torque-generated/field-offsets.h",
"$target_gen_dir/torque-generated/class-verifiers.cc",
"$target_gen_dir/torque-generated/class-verifiers.h",
"$target_gen_dir/torque-generated/enum-verifiers.cc",
"$target_gen_dir/torque-generated/objects-printer.cc",
"$target_gen_dir/torque-generated/objects-body-descriptors-inl.inc",
"$target_gen_dir/torque-generated/class-definitions.cc",
"$target_gen_dir/torque-generated/class-definitions-inl.h",
"$target_gen_dir/torque-generated/class-definitions.h",
"$target_gen_dir/torque-generated/class-debug-readers.cc",
"$target_gen_dir/torque-generated/class-debug-readers.h",
"$target_gen_dir/torque-generated/exported-macros-assembler.cc",
"$target_gen_dir/torque-generated/exported-macros-assembler.h",
"$target_gen_dir/torque-generated/csa-types.h",
"$target_gen_dir/torque-generated/instance-types.h",
"$target_gen_dir/torque-generated/internal-class-definitions.h",
"$target_gen_dir/torque-generated/internal-class-definitions-inl.h",
"$target_gen_dir/torque-generated/exported-class-definitions.h",
"$target_gen_dir/torque-generated/exported-class-definitions-inl.h",
]
outputs = []
foreach(file, files) {
outputs += [ "$destination_folder/$file" ]
outputs += [ string_replace(file,
"$target_gen_dir/torque-generated",
destination_folder) ]
}
foreach(file, torque_files) {
@ -1422,10 +1424,10 @@ v8_source_set("torque_generated_initializers") {
public_deps = [ ":v8_maybe_icu" ]
sources = [
"$target_gen_dir/torque-generated/csa-types-tq.h",
"$target_gen_dir/torque-generated/enum-verifiers-tq.cc",
"$target_gen_dir/torque-generated/exported-macros-assembler-tq.cc",
"$target_gen_dir/torque-generated/exported-macros-assembler-tq.h",
"$target_gen_dir/torque-generated/csa-types.h",
"$target_gen_dir/torque-generated/enum-verifiers.cc",
"$target_gen_dir/torque-generated/exported-macros-assembler.cc",
"$target_gen_dir/torque-generated/exported-macros-assembler.h",
"src/torque/runtime-support.h",
]
foreach(file, torque_files) {
@ -1451,11 +1453,11 @@ v8_source_set("torque_generated_definitions") {
public_deps = [ ":v8_maybe_icu" ]
sources = [
"$target_gen_dir/torque-generated/class-definitions-tq.cc",
"$target_gen_dir/torque-generated/class-verifiers-tq.cc",
"$target_gen_dir/torque-generated/class-verifiers-tq.h",
"$target_gen_dir/torque-generated/factory-tq.cc",
"$target_gen_dir/torque-generated/objects-printer-tq.cc",
"$target_gen_dir/torque-generated/class-definitions.cc",
"$target_gen_dir/torque-generated/class-verifiers.cc",
"$target_gen_dir/torque-generated/class-verifiers.h",
"$target_gen_dir/torque-generated/factory.cc",
"$target_gen_dir/torque-generated/objects-printer.cc",
]
configs = [ ":internal_config" ]

View File

@ -8,7 +8,7 @@
#include "builtins-generated/bytecodes-builtins-list.h"
// include generated header
#include "torque-generated/builtin-definitions-tq.h"
#include "torque-generated/builtin-definitions.h"
namespace v8 {
namespace internal {

View File

@ -9,7 +9,7 @@
#include "src/ic/ic.h"
#include "src/ic/keyed-store-generic.h"
#include "src/objects/objects-inl.h"
#include "torque-generated/exported-macros-assembler-tq.h"
#include "torque-generated/exported-macros-assembler.h"
namespace v8 {
namespace internal {

View File

@ -3,15 +3,14 @@
// found in the LICENSE file.
#include "src/builtins/builtins-proxy-gen.h"
#include "src/builtins/builtins-utils-gen.h"
#include "src/builtins/builtins-utils.h"
#include "src/builtins/builtins.h"
#include "src/logging/counters.h"
#include "src/objects/js-proxy.h"
#include "src/objects/objects-inl.h"
#include "torque-generated/exported-macros-assembler-tq.h"
#include "torque-generated/exported-macros-assembler.h"
namespace v8 {
namespace internal {

View File

@ -13,7 +13,7 @@
#include "src/codegen/code-stub-assembler.h"
#include "src/compiler/code-assembler.h"
#include "src/utils/utils.h"
#include "torque-generated/csa-types-tq.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/csa-types.h"
#include "torque-generated/field-offsets.h"
#endif // V8_BUILTINS_TORQUE_CSA_HEADER_INCLUDES_H_

View File

@ -22,7 +22,7 @@
#include "src/objects/smi.h"
#include "src/objects/tagged-index.h"
#include "src/roots/roots.h"
#include "torque-generated/exported-macros-assembler-tq.h"
#include "torque-generated/exported-macros-assembler.h"
namespace v8 {
namespace internal {

View File

@ -1569,7 +1569,7 @@ BUILTIN_LIST_TFS(DEFINE_TFS_BUILTIN_DESCRIPTOR)
// This file contains interface descriptor class definitions for builtins
// defined in Torque. It is included here because the class definitions need to
// precede the definition of name##Descriptor::key() below.
#include "torque-generated/interface-descriptors-tq.inc"
#include "torque-generated/interface-descriptors.inc"
#undef DECLARE_DEFAULT_DESCRIPTOR
#undef DECLARE_DESCRIPTOR_WITH_BASE

View File

@ -17,7 +17,7 @@
#include "src/objects/objects-inl.h"
#include "src/objects/ordered-hash-table.h"
#include "src/objects/source-text-module.h"
#include "torque-generated/exported-class-definitions-tq.h"
#include "torque-generated/exported-class-definitions.h"
namespace v8 {
namespace internal {

View File

@ -8,8 +8,8 @@
#include "src/compiler/access-builder.h"
#include "src/compiler/allocation-builder.h"
#include "src/objects/map-inl.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-tq.h"
#include "torque-generated/exported-class-definitions-inl.h"
#include "torque-generated/exported-class-definitions.h"
namespace v8 {
namespace internal {

View File

@ -28,7 +28,7 @@
#include "src/objects/js-regexp-inl.h"
#include "src/objects/objects-inl.h"
#include "src/objects/template-objects.h"
#include "torque-generated/exported-class-definitions-tq.h"
#include "torque-generated/exported-class-definitions.h"
namespace v8 {
namespace internal {

View File

@ -27,7 +27,7 @@
#include "src/objects/heap-number-inl.h"
#include "src/objects/smi.h"
#include "src/tracing/trace-event.h"
#include "torque-generated/exported-class-definitions-tq.h"
#include "torque-generated/exported-class-definitions.h"
// Has to be the last include (doesn't have include guards)
#include "src/objects/object-macros.h"

View File

@ -10,7 +10,7 @@
#include "src/base/lazy-instance.h"
#include "src/heap/heap-inl.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-inl.h"
namespace v8 {
namespace internal {

View File

@ -14,7 +14,7 @@
#include "src/base/macros.h"
#include "src/base/platform/mutex.h"
#include "src/common/globals.h"
#include "torque-generated/exported-class-definitions-tq.h"
#include "torque-generated/exported-class-definitions.h"
namespace v8 {
namespace internal {

View File

@ -71,9 +71,9 @@
#include "src/regexp/regexp.h"
#include "src/utils/ostreams.h"
#include "src/wasm/wasm-objects-inl.h"
#include "torque-generated/class-verifiers-tq.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/internal-class-definitions-tq-inl.h"
#include "torque-generated/class-verifiers.h"
#include "torque-generated/exported-class-definitions-inl.h"
#include "torque-generated/internal-class-definitions-inl.h"
namespace v8 {
namespace internal {

View File

@ -69,9 +69,9 @@
#include "src/wasm/wasm-code-manager.h"
#include "src/wasm/wasm-engine.h"
#include "src/wasm/wasm-objects-inl.h"
#include "torque-generated/class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/internal-class-definitions-tq-inl.h"
#include "torque-generated/class-definitions-inl.h"
#include "torque-generated/exported-class-definitions-inl.h"
#include "torque-generated/internal-class-definitions-inl.h"
namespace v8 {
namespace internal {

View File

@ -112,7 +112,7 @@ class V8_EXPORT_PRIVATE Factory : public FactoryBase<Factory> {
return handle(obj, isolate());
}
#include "torque-generated/factory-tq.inc"
#include "torque-generated/factory.inc"
Handle<Oddball> NewOddball(Handle<Map> map, const char* to_string,
Handle<Object> to_number, const char* type_of,

View File

@ -9,7 +9,7 @@
#include "src/objects/map.h"
#include "src/objects/objects.h"
#include "src/objects/visitors.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/field-offsets.h"
namespace v8 {
namespace internal {

View File

@ -44,9 +44,9 @@
#include "src/objects/template-objects-inl.h"
#include "src/regexp/regexp.h"
#include "src/wasm/wasm-objects.h"
#include "torque-generated/class-definitions-tq.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/internal-class-definitions-tq-inl.h"
#include "torque-generated/class-definitions.h"
#include "torque-generated/exported-class-definitions-inl.h"
#include "torque-generated/internal-class-definitions-inl.h"
namespace v8 {
namespace internal {

View File

@ -27,7 +27,7 @@
#include "src/objects/shared-function-info.h"
#include "src/objects/source-text-module.h"
#include "src/utils/ostreams.h"
#include "torque-generated/exported-macros-assembler-tq.h"
#include "torque-generated/exported-macros-assembler.h"
namespace v8 {
namespace internal {

View File

@ -13,7 +13,7 @@
#include "src/objects/js-objects-inl.h"
#include "src/objects/name.h"
#include "src/objects/templates.h"
#include "torque-generated/class-definitions-tq-inl.h"
#include "torque-generated/class-definitions-inl.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,8 +6,8 @@
#define V8_OBJECTS_API_CALLBACKS_H_
#include "src/objects/struct.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/class-definitions-tq.h"
#include "torque-generated/bit-fields.h"
#include "torque-generated/class-definitions.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -8,7 +8,7 @@
#include "src/objects/fixed-array.h"
#include "src/objects/js-objects.h"
#include "src/objects/struct.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/field-offsets.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,7 +6,7 @@
#define V8_OBJECTS_CELL_H_
#include "src/objects/heap-object.h"
#include "torque-generated/class-definitions-tq.h"
#include "torque-generated/class-definitions.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,7 +6,7 @@
#define V8_OBJECTS_CLASS_DEFINITIONS_TQ_DEPS_INL_H_
// This is a collection of -inl.h files required by the generated file
// class-definitions-tq.cc. Generally, classes using @generateCppClass need an
// class-definitions.cc. Generally, classes using @generateCppClass need an
// entry here.
#include "src/objects/allocation-site-inl.h"
#include "src/objects/arguments-inl.h"

View File

@ -9,7 +9,7 @@
#include "src/objects/function-kind.h"
#include "src/objects/ordered-hash-table.h"
#include "src/objects/osr-optimized-code-cache.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/field-offsets.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -11,7 +11,7 @@
#include "src/objects/fixed-array.h"
#include "src/objects/objects.h"
#include "src/objects/struct.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/bit-fields.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -22,8 +22,8 @@
#include "src/objects/slots-atomic-inl.h"
#include "src/objects/slots.h"
#include "src/utils/utils.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-tq.h"
#include "torque-generated/exported-class-definitions-inl.h"
#include "torque-generated/exported-class-definitions.h"
// Each concrete ElementsAccessor can handle exactly one ElementsKind,
// several abstract ElementsAccessor classes are used to allow sharing

View File

@ -8,7 +8,7 @@
#include "src/common/globals.h"
#include "src/handles/maybe-handles.h"
#include "src/objects/heap-object.h"
#include "torque-generated/class-definitions-tq.h"
#include "torque-generated/class-definitions.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -17,7 +17,7 @@
#include "src/objects/name.h"
#include "src/objects/type-hints.h"
#include "src/zone/zone-containers.h"
#include "torque-generated/class-definitions-tq.h"
#include "torque-generated/class-definitions.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -20,8 +20,7 @@
#include "src/objects/slots.h"
#include "src/roots/roots-inl.h"
#include "src/sanitizer/tsan.h"
#include "torque-generated/class-definitions-tq-inl.h"
#include "torque-generated/class-definitions-inl.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -9,7 +9,7 @@
#include "src/objects/instance-type.h"
#include "src/objects/objects.h"
#include "src/objects/smi.h"
#include "torque-generated/class-definitions-tq.h"
#include "torque-generated/class-definitions.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,7 +6,7 @@
#define V8_OBJECTS_FOREIGN_H_
#include "src/objects/heap-object.h"
#include "torque-generated/class-definitions-tq.h"
#include "torque-generated/class-definitions.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,7 +6,7 @@
#define V8_OBJECTS_FREE_SPACE_H_
#include "src/objects/heap-object.h"
#include "torque-generated/class-definitions-tq.h"
#include "torque-generated/class-definitions.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -10,8 +10,7 @@
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"
#include "torque-generated/instance-types-tq.h"
#include "torque-generated/instance-types.h"
namespace v8 {
namespace internal {

View File

@ -7,7 +7,7 @@
#include "src/objects/backing-store.h"
#include "src/objects/js-objects.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/bit-fields.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -8,7 +8,7 @@
#include "src/objects/allocation-site.h"
#include "src/objects/fixed-array.h"
#include "src/objects/js-objects.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/field-offsets.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -15,7 +15,7 @@
#include "src/objects/intl-objects.h"
#include "src/objects/managed.h"
#include "src/objects/objects.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/field-offsets.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -16,7 +16,7 @@
#include "src/execution/isolate.h"
#include "src/objects/intl-objects.h"
#include "src/objects/managed.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/field-offsets.h"
#include "unicode/uversion.h"
// Has to be the last include (doesn't have include guards):

View File

@ -7,8 +7,8 @@
#include "src/objects/code-kind.h"
#include "src/objects/js-objects.h"
#include "torque-generated/class-definitions-tq.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/class-definitions.h"
#include "torque-generated/field-offsets.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -70,8 +70,8 @@
#include "src/strings/string-stream.h"
#include "src/utils/ostreams.h"
#include "src/wasm/wasm-objects.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-tq.h"
#include "torque-generated/exported-class-definitions-inl.h"
#include "torque-generated/exported-class-definitions.h"
namespace v8 {
namespace internal {

View File

@ -10,8 +10,8 @@
#include "src/objects/internal-index.h"
#include "src/objects/objects.h"
#include "src/objects/property-array.h"
#include "torque-generated/class-definitions-tq.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/class-definitions.h"
#include "torque-generated/field-offsets.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -7,7 +7,7 @@
#include "src/objects/js-objects.h"
#include "src/objects/promise.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/bit-fields.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,7 +6,7 @@
#define V8_OBJECTS_JS_PROXY_H_
#include "src/objects/js-objects.h"
#include "torque-generated/builtin-definitions-tq.h"
#include "torque-generated/builtin-definitions.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,7 +6,7 @@
#define V8_OBJECTS_JS_REGEXP_STRING_ITERATOR_H_
#include "src/objects/js-objects.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/bit-fields.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,7 +6,7 @@
#define V8_OBJECTS_JS_REGEXP_H_
#include "src/objects/js-array.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/bit-fields.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,7 +6,7 @@
#define V8_OBJECTS_JS_WEAK_REFS_H_
#include "src/objects/js-objects.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/bit-fields.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -14,8 +14,8 @@
#include "src/objects/hash-table-inl.h"
#include "src/objects/heap-number-inl.h"
#include "src/objects/struct-inl.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-tq.h"
#include "torque-generated/exported-class-definitions-inl.h"
#include "torque-generated/exported-class-definitions.h"
namespace v8 {
namespace internal {

View File

@ -25,9 +25,9 @@
#include "src/roots/roots.h"
#include "src/utils/ostreams.h"
#include "src/zone/zone-containers.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-tq.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/exported-class-definitions-inl.h"
#include "torque-generated/exported-class-definitions.h"
#include "torque-generated/field-offsets.h"
namespace v8 {
namespace internal {

View File

@ -11,8 +11,8 @@
#include "src/objects/heap-object.h"
#include "src/objects/internal-index.h"
#include "src/objects/objects.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/bit-fields.h"
#include "torque-generated/field-offsets.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -9,7 +9,7 @@
#include "src/objects/js-objects.h"
#include "src/objects/objects.h"
#include "src/objects/struct.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/field-offsets.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -8,7 +8,7 @@
#include "src/base/bit-field.h"
#include "src/objects/objects.h"
#include "src/objects/primitive-heap-object.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/bit-fields.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -5,7 +5,7 @@
#ifndef V8_OBJECTS_OBJECT_LIST_MACROS_H_
#define V8_OBJECTS_OBJECT_LIST_MACROS_H_
#include "torque-generated/instance-types-tq.h"
#include "torque-generated/instance-types.h"
namespace v8 {
namespace internal {

View File

@ -21,9 +21,9 @@
#include "src/objects/synthetic-module.h"
#include "src/objects/transitions.h"
#include "src/wasm/wasm-objects-inl.h"
#include "torque-generated/class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/internal-class-definitions-tq-inl.h"
#include "torque-generated/class-definitions-inl.h"
#include "torque-generated/exported-class-definitions-inl.h"
#include "torque-generated/internal-class-definitions-inl.h"
namespace v8 {
namespace internal {
@ -1179,7 +1179,7 @@ class EphemeronHashTable::BodyDescriptor final : public BodyDescriptorBase {
}
};
#include "torque-generated/objects-body-descriptors-tq-inl.inc"
#include "torque-generated/objects-body-descriptors-inl.inc"
} // namespace internal
} // namespace v8

View File

@ -6,8 +6,7 @@
#define V8_OBJECTS_OBJECTS_DEFINITIONS_H_
#include "src/init/heap-symbols.h"
#include "torque-generated/instance-types-tq.h"
#include "torque-generated/instance-types.h"
namespace v8 {

View File

@ -42,7 +42,7 @@
#include "src/objects/tagged-index.h"
#include "src/objects/templates.h"
#include "src/sanitizer/tsan.h"
#include "torque-generated/class-definitions-tq-inl.h"
#include "torque-generated/class-definitions-inl.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -126,9 +126,9 @@
#include "src/wasm/wasm-engine.h"
#include "src/wasm/wasm-objects.h"
#include "src/zone/zone.h"
#include "torque-generated/class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/internal-class-definitions-tq-inl.h"
#include "torque-generated/class-definitions-inl.h"
#include "torque-generated/exported-class-definitions-inl.h"
#include "torque-generated/internal-class-definitions-inl.h"
namespace v8 {
namespace internal {

View File

@ -8,7 +8,7 @@
#include "src/objects/primitive-heap-object.h"
#include "src/objects/heap-object-inl.h"
#include "torque-generated/class-definitions-tq-inl.h"
#include "torque-generated/class-definitions-inl.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,7 +6,7 @@
#define V8_OBJECTS_PRIMITIVE_HEAP_OBJECT_H_
#include "src/objects/heap-object.h"
#include "torque-generated/class-definitions-tq.h"
#include "torque-generated/class-definitions.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,7 +6,7 @@
#define V8_OBJECTS_PROPERTY_ARRAY_H_
#include "src/objects/heap-object.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/field-offsets.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,7 +6,7 @@
#define V8_OBJECTS_PROPERTY_CELL_H_
#include "src/objects/heap-object.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/field-offsets.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,7 +6,7 @@
#define V8_OBJECTS_PROPERTY_DESCRIPTOR_OBJECT_H_
#include "src/objects/struct.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/bit-fields.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -8,7 +8,7 @@
#include "src/objects/fixed-array.h"
#include "src/objects/objects.h"
#include "src/objects/struct.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/bit-fields.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -11,7 +11,7 @@
#include "src/objects/objects.h"
#include "src/utils/utils.h"
#include "testing/gtest/include/gtest/gtest_prod.h" // nogncheck
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/bit-fields.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -11,7 +11,7 @@
#include "src/objects/fixed-array.h"
#include "src/objects/objects.h"
#include "src/objects/struct.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/bit-fields.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -19,8 +19,8 @@
#include "src/objects/struct.h"
#include "src/roots/roots.h"
#include "testing/gtest/include/gtest/gtest_prod.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/field-offsets-tq.h"
#include "torque-generated/bit-fields.h"
#include "torque-generated/field-offsets.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -7,7 +7,7 @@
#include "src/objects/module.h"
#include "src/objects/promise.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/bit-fields.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,7 +6,7 @@
#define V8_OBJECTS_STACK_FRAME_INFO_H_
#include "src/objects/struct.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/bit-fields.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -11,7 +11,7 @@
#include "src/objects/objects-inl.h"
#include "src/objects/oddball.h"
#include "src/roots/roots-inl.h"
#include "torque-generated/class-definitions-tq-inl.h"
#include "torque-generated/class-definitions-inl.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -7,7 +7,7 @@
#include "src/objects/heap-object.h"
#include "src/objects/objects.h"
#include "torque-generated/class-definitions-tq.h"
#include "torque-generated/class-definitions.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -6,7 +6,7 @@
#define V8_OBJECTS_TEMPLATES_H_
#include "src/objects/struct.h"
#include "torque-generated/bit-fields-tq.h"
#include "torque-generated/bit-fields.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"

View File

@ -18,8 +18,8 @@
#include "src/objects/module-inl.h"
#include "src/objects/smi.h"
#include "src/runtime/runtime-utils.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-tq.h"
#include "torque-generated/exported-class-definitions-inl.h"
#include "torque-generated/exported-class-definitions.h"
namespace v8 {
namespace internal {

View File

@ -532,7 +532,7 @@ void GenerateClassDebugReader(const ClassType& type, std::ostream& h_contents,
void ImplementationVisitor::GenerateClassDebugReaders(
const std::string& output_directory) {
const std::string file_name = "class-debug-readers-tq";
const std::string file_name = "class-debug-readers";
std::stringstream h_contents;
std::stringstream cc_contents;
h_contents << "// Provides the ability to read object properties in\n";

View File

@ -3124,13 +3124,13 @@ std::string MachineTypeString(const Type* type) {
void ImplementationVisitor::GenerateBuiltinDefinitionsAndInterfaceDescriptors(
const std::string& output_directory) {
std::stringstream builtin_definitions;
std::string builtin_definitions_file_name = "builtin-definitions-tq.h";
std::string builtin_definitions_file_name = "builtin-definitions.h";
// This file contains plain interface descriptor definitions and has to be
// included in the middle of interface-descriptors.h. Thus it is not a normal
// header file and uses the .inc suffix instead of the .h suffix.
std::stringstream interface_descriptors;
std::string interface_descriptors_file_name = "interface-descriptors-tq.inc";
std::string interface_descriptors_file_name = "interface-descriptors.inc";
{
IncludeGuardScope builtin_definitions_include_guard(
builtin_definitions, builtin_definitions_file_name);
@ -3420,7 +3420,7 @@ void GenerateClassExport(const ClassType* type, std::ostream& header,
void ImplementationVisitor::GenerateClassFieldOffsets(
const std::string& output_directory) {
std::stringstream header;
std::string file_name = "field-offsets-tq.h";
std::string file_name = "field-offsets.h";
{
IncludeGuardScope include_guard(header, file_name);
@ -3471,7 +3471,7 @@ void ImplementationVisitor::GenerateClassFieldOffsets(
void ImplementationVisitor::GenerateBitFields(
const std::string& output_directory) {
std::stringstream header;
std::string file_name = "bit-fields-tq.h";
std::string file_name = "bit-fields.h";
{
IncludeGuardScope include_guard(header, file_name);
header << "#include \"src/base/bit-field.h\"\n\n";
@ -4037,10 +4037,10 @@ void EmitClassDefinitionHeadersIncludes(const std::string& basename,
header << "#include \"src/objects/objects.h\"\n";
header << "#include \"src/objects/heap-object.h\"\n";
header << "#include \"src/objects/smi.h\"\n";
header << "#include \"torque-generated/field-offsets-tq.h\"\n";
header << "#include \"torque-generated/field-offsets.h\"\n";
header << "#include <type_traits>\n\n";
inline_header << "#include \"torque-generated/class-definitions-tq.h\"\n";
inline_header << "#include \"torque-generated/class-definitions.h\"\n";
inline_header << "#include \"src/objects/js-function.h\"\n";
inline_header << "#include \"src/objects/js-objects.h\"\n";
inline_header << "#include \"src/objects/js-promise.h\"\n";
@ -4086,7 +4086,7 @@ void ImplementationVisitor::GenerateClassDefinitions(
std::stringstream implementation;
std::stringstream factory_header;
std::stringstream factory_impl;
std::string basename = "class-definitions-tq";
std::string basename = "class-definitions";
std::string internal_basename = "internal-" + basename;
std::string exported_basename = "exported-" + basename;
std::string file_basename = output_directory + "/" + basename;
@ -4094,7 +4094,7 @@ void ImplementationVisitor::GenerateClassDefinitions(
output_directory + "/" + internal_basename;
std::string exported_file_basename =
output_directory + "/" + exported_basename;
std::string factory_basename = "factory-tq";
std::string factory_basename = "factory";
std::string factory_file_basename = output_directory + "/" + factory_basename;
{
@ -4115,17 +4115,17 @@ void ImplementationVisitor::GenerateClassDefinitions(
IncludeGuardScope exported_inline_header_guard(
inline_exported_header, exported_basename + "-inl.h");
internal_header << "#include \"torque-generated/class-definitions-tq.h\"\n";
internal_header << "#include \"torque-generated/class-definitions.h\"\n";
internal_header << "#include \"src/objects/fixed-array.h\"\n";
inline_internal_header
<< "#include \"torque-generated/internal-class-definitions-tq.h\"\n";
<< "#include \"torque-generated/internal-class-definitions.h\"\n";
inline_internal_header
<< "#include \"torque-generated/class-definitions-tq-inl.h\"\n";
<< "#include \"torque-generated/class-definitions-inl.h\"\n";
exported_header << "#include \"src/objects/fixed-array.h\"\n";
exported_header << "#include \"torque-generated/class-definitions-tq.h\"\n";
exported_header << "#include \"torque-generated/class-definitions.h\"\n";
inline_exported_header
<< "#include \"torque-generated/exported-class-definitions-tq.h\"\n";
<< "#include \"torque-generated/exported-class-definitions.h\"\n";
inline_exported_header << "#include \"src/objects/fixed-array-inl.h\"\n";
EmitClassDefinitionHeadersIncludes(basename, external_header,
@ -4165,26 +4165,23 @@ void ImplementationVisitor::GenerateClassDefinitions(
factory_impl << "#include \"src/heap/heap.h\"\n";
factory_impl << "#include \"src/heap/heap-inl.h\"\n";
factory_impl << "#include \"src/execution/isolate.h\"\n\n";
factory_impl
<< "#include "
"\"torque-generated/internal-class-definitions-tq-inl.h\"\n\n";
factory_impl
<< "#include "
"\"torque-generated/exported-class-definitions-tq-inl.h\"\n\n";
factory_impl << "#include "
"\"torque-generated/internal-class-definitions-inl.h\"\n\n";
factory_impl << "#include "
"\"torque-generated/exported-class-definitions-inl.h\"\n\n";
NamespaceScope factory_impl_namespaces(factory_impl, {"v8", "internal"});
factory_impl << "\n";
implementation
<< "#include \"torque-generated/class-definitions-tq.h\"\n\n";
implementation << "#include \"torque-generated/class-verifiers-tq.h\"\n\n";
implementation << "#include \"torque-generated/class-definitions.h\"\n\n";
implementation << "#include \"torque-generated/class-verifiers.h\"\n\n";
implementation
<< "#include \"src/objects/class-definitions-tq-deps-inl.h\"\n\n";
implementation
<< "#include "
"\"torque-generated/internal-class-definitions-tq-inl.h\"\n\n";
"\"torque-generated/internal-class-definitions-inl.h\"\n\n";
implementation
<< "#include "
"\"torque-generated/exported-class-definitions-tq-inl.h\"\n\n";
"\"torque-generated/exported-class-definitions-inl.h\"\n\n";
NamespaceScope implementation_namespaces(implementation,
{"v8", "internal"});
@ -4339,16 +4336,16 @@ void GeneratePrintDefinitionsForClass(std::ostream& impl, const ClassType* type,
void ImplementationVisitor::GeneratePrintDefinitions(
const std::string& output_directory) {
std::stringstream impl;
std::string file_name = "objects-printer-tq.cc";
std::string file_name = "objects-printer.cc";
{
IfDefScope object_print(impl, "OBJECT_PRINT");
impl << "#include \"src/objects/objects.h\"\n\n";
impl << "#include <iosfwd>\n\n";
impl << "#include "
"\"torque-generated/internal-class-definitions-tq-inl.h\"\n";
"\"torque-generated/internal-class-definitions-inl.h\"\n";
impl << "#include "
"\"torque-generated/exported-class-definitions-tq-inl.h\"\n";
"\"torque-generated/exported-class-definitions-inl.h\"\n";
impl << "#include \"src/objects/struct-inl.h\"\n\n";
impl << "#include \"src/objects/template-objects-inl.h\"\n\n";
@ -4420,7 +4417,7 @@ base::Optional<std::string> MatchSimpleBodyDescriptor(const ClassType* type) {
void ImplementationVisitor::GenerateBodyDescriptors(
const std::string& output_directory) {
std::string file_name = "objects-body-descriptors-tq-inl.inc";
std::string file_name = "objects-body-descriptors-inl.inc";
std::stringstream h_contents;
for (const ClassType* type : TypeOracle::GetClasses()) {
@ -4656,7 +4653,7 @@ void GenerateClassFieldVerifier(const std::string& class_name,
void ImplementationVisitor::GenerateClassVerifiers(
const std::string& output_directory) {
std::string file_name = "class-verifiers-tq";
std::string file_name = "class-verifiers";
std::stringstream h_contents;
std::stringstream cc_contents;
{
@ -4671,9 +4668,9 @@ void ImplementationVisitor::GenerateClassVerifiers(
}
cc_contents << "#include \"torque-generated/" << file_name << ".h\"\n";
cc_contents << "#include "
"\"torque-generated/internal-class-definitions-tq-inl.h\"\n";
"\"torque-generated/internal-class-definitions-inl.h\"\n";
cc_contents << "#include "
"\"torque-generated/exported-class-definitions-tq-inl.h\"\n";
"\"torque-generated/exported-class-definitions-inl.h\"\n";
IncludeObjectMacrosScope object_macros(cc_contents);
@ -4743,7 +4740,7 @@ void ImplementationVisitor::GenerateClassVerifiers(
void ImplementationVisitor::GenerateEnumVerifiers(
const std::string& output_directory) {
std::string file_name = "enum-verifiers-tq";
std::string file_name = "enum-verifiers";
std::stringstream cc_contents;
{
cc_contents << "#include \"src/compiler/code-assembler.h\"\n";
@ -4775,7 +4772,7 @@ void ImplementationVisitor::GenerateEnumVerifiers(
void ImplementationVisitor::GenerateExportedMacrosAssembler(
const std::string& output_directory) {
std::string file_name = "exported-macros-assembler-tq";
std::string file_name = "exported-macros-assembler";
std::stringstream h_contents;
std::stringstream cc_contents;
{
@ -4783,11 +4780,11 @@ void ImplementationVisitor::GenerateExportedMacrosAssembler(
h_contents << "#include \"src/compiler/code-assembler.h\"\n";
h_contents << "#include \"src/execution/frames.h\"\n";
h_contents << "#include \"torque-generated/csa-types-tq.h\"\n";
h_contents << "#include \"torque-generated/csa-types.h\"\n";
h_contents
<< "#include \"torque-generated/internal-class-definitions-tq.h\"\n";
<< "#include \"torque-generated/internal-class-definitions.h\"\n";
h_contents
<< "#include \"torque-generated/exported-class-definitions-tq.h\"\n";
<< "#include \"torque-generated/exported-class-definitions.h\"\n";
cc_contents << "#include \"src/objects/fixed-array-inl.h\"\n";
cc_contents << "#include \"src/objects/free-space.h\"\n";
cc_contents << "#include \"src/objects/js-regexp-string-iterator.h\"\n";
@ -4862,7 +4859,7 @@ void ImplementationVisitor::GenerateExportedMacrosAssembler(
void ImplementationVisitor::GenerateCSATypes(
const std::string& output_directory) {
std::string file_name = "csa-types-tq";
std::string file_name = "csa-types";
std::stringstream h_contents;
{
IncludeGuardScope include_guard(h_contents, file_name + ".h");

View File

@ -372,7 +372,7 @@ void PrintInstanceTypes(InstanceTypeTree* root, std::ostream& definitions,
void ImplementationVisitor::GenerateInstanceTypes(
const std::string& output_directory) {
std::stringstream header;
std::string file_name = "instance-types-tq.h";
std::string file_name = "instance-types.h";
{
IncludeGuardScope guard(header, file_name);

View File

@ -16,7 +16,7 @@
#include "src/objects/objects.h"
#include "src/wasm/struct-types.h"
#include "src/wasm/value-type.h"
#include "torque-generated/class-definitions-tq.h"
#include "torque-generated/class-definitions.h"
// Has to be the last include (doesn't have include guards)
#include "src/objects/object-macros.h"

View File

@ -19,7 +19,7 @@
#include "src/strings/char-predicates.h"
#include "test/cctest/compiler/code-assembler-tester.h"
#include "test/cctest/compiler/function-tester.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-inl.h"
namespace v8 {
namespace internal {

View File

@ -75,9 +75,9 @@ v8_component("v8_debug_helper") {
public = [ "debug-helper.h" ]
sources = [
"$target_gen_dir/../../torque-generated/class-debug-readers-tq.cc",
"$target_gen_dir/../../torque-generated/class-debug-readers-tq.h",
"$target_gen_dir/../../torque-generated/instance-types-tq.h",
"$target_gen_dir/../../torque-generated/class-debug-readers.cc",
"$target_gen_dir/../../torque-generated/class-debug-readers.h",
"$target_gen_dir/../../torque-generated/instance-types.h",
"$target_gen_dir/heap-constants-gen.cc",
"compiler-types.cc",
"debug-helper-internal.cc",

View File

@ -4,7 +4,7 @@
#include "debug-helper-internal.h"
#include "src/common/ptr-compr-inl.h"
#include "torque-generated/class-debug-readers-tq.h"
#include "torque-generated/class-debug-readers.h"
namespace i = v8::internal;

View File

@ -13,7 +13,7 @@
#include "src/execution/isolate-utils.h"
#include "src/objects/string-inl.h"
#include "src/strings/unicode-inl.h"
#include "torque-generated/class-debug-readers-tq.h"
#include "torque-generated/class-debug-readers.h"
namespace i = v8::internal;

View File

@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "debug-helper-internal.h"
#include "torque-generated/class-debug-readers-tq.h"
#include "torque-generated/class-debug-readers.h"
namespace di = v8::internal::debug_helper_internal;

View File

@ -21,7 +21,7 @@ BASE_PATH = os.path.dirname(os.path.dirname(GCMOLE_PATH))
assert len(sys.argv) == 2
if not os.path.isfile("out/Release/gen/torque-generated/builtin-definitions-tq.h"):
if not os.path.isfile("out/Release/gen/torque-generated/builtin-definitions.h"):
print("Expected generated headers in out/Release/gen.")
print("Either build v8 in out/Release or change gcmole.lua:115")
sys.exit(-1)