From 6c6fc948cf043b32a64adb377ed5f496467f27be Mon Sep 17 00:00:00 2001 From: Shu-yu Guo Date: Mon, 25 Apr 2022 15:41:09 -0700 Subject: [PATCH] [ShadowRealm] Make filenames consistent Make the file names consistent on "shadow-realm" (i.e. singular, with a dash). Bug: v8:11989 Change-Id: Id0a6f417fd9b53b9f7ddf9677da7396fa2481af6 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3606392 Reviewed-by: Adam Klein Commit-Queue: Shu-yu Guo Cr-Commit-Position: refs/heads/main@{#80164} --- BUILD.bazel | 10 +++++----- BUILD.gn | 10 +++++----- src/builtins/base.tq | 2 +- ...shadowrealm-gen.cc => builtins-shadow-realm-gen.cc} | 2 +- ...ltins-shadow-realms.cc => builtins-shadow-realm.cc} | 2 +- src/diagnostics/objects-debug.cc | 2 +- src/init/bootstrapper.cc | 2 +- src/objects/all-objects-inl.h | 2 +- src/objects/js-objects.cc | 2 +- .../{js-shadow-realms-inl.h => js-shadow-realm-inl.h} | 10 +++++----- src/objects/{js-shadow-realms.h => js-shadow-realm.h} | 8 ++++---- .../{js-shadow-realms.tq => js-shadow-realm.tq} | 0 12 files changed, 26 insertions(+), 26 deletions(-) rename src/builtins/{builtins-shadowrealm-gen.cc => builtins-shadow-realm-gen.cc} (99%) rename src/builtins/{builtins-shadow-realms.cc => builtins-shadow-realm.cc} (99%) rename src/objects/{js-shadow-realms-inl.h => js-shadow-realm-inl.h} (69%) rename src/objects/{js-shadow-realms.h => js-shadow-realm.h} (82%) rename src/objects/{js-shadow-realms.tq => js-shadow-realm.tq} (100%) diff --git a/BUILD.bazel b/BUILD.bazel index 84847d1273..2793f807f8 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -912,7 +912,7 @@ filegroup( "src/objects/js-proxy.tq", "src/objects/js-regexp-string-iterator.tq", "src/objects/js-regexp.tq", - "src/objects/js-shadow-realms.tq", + "src/objects/js-shadow-realm.tq", "src/objects/js-struct.tq", "src/objects/js-temporal-objects.tq", "src/objects/js-weak-refs.tq", @@ -1119,7 +1119,7 @@ filegroup( "src/builtins/builtins-promise.h", "src/builtins/builtins-reflect.cc", "src/builtins/builtins-regexp.cc", - "src/builtins/builtins-shadow-realms.cc", + "src/builtins/builtins-shadow-realm.cc", "src/builtins/builtins-sharedarraybuffer.cc", "src/builtins/builtins-string.cc", "src/builtins/builtins-struct.cc", @@ -1727,8 +1727,8 @@ filegroup( "src/objects/js-regexp-string-iterator.h", "src/objects/js-regexp.cc", "src/objects/js-regexp.h", - "src/objects/js-shadow-realms.h", - "src/objects/js-shadow-realms-inl.h", + "src/objects/js-shadow-realm.h", + "src/objects/js-shadow-realm-inl.h", "src/objects/js-struct.h", "src/objects/js-struct-inl.h", "src/objects/js-temporal-objects.h", @@ -2889,7 +2889,7 @@ filegroup( "src/builtins/builtins-proxy-gen.h", "src/builtins/builtins-regexp-gen.cc", "src/builtins/builtins-regexp-gen.h", - "src/builtins/builtins-shadowrealm-gen.cc", + "src/builtins/builtins-shadow-realm-gen.cc", "src/builtins/builtins-sharedarraybuffer-gen.cc", "src/builtins/builtins-string-gen.cc", "src/builtins/builtins-string-gen.h", diff --git a/BUILD.gn b/BUILD.gn index 950a7164dd..27cc68d8b7 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1786,7 +1786,7 @@ torque_files = [ "src/objects/js-proxy.tq", "src/objects/js-regexp-string-iterator.tq", "src/objects/js-regexp.tq", - "src/objects/js-shadow-realms.tq", + "src/objects/js-shadow-realm.tq", "src/objects/js-struct.tq", "src/objects/js-temporal-objects.tq", "src/objects/js-weak-refs.tq", @@ -2365,7 +2365,7 @@ v8_source_set("v8_initializers") { "src/builtins/builtins-proxy-gen.h", "src/builtins/builtins-regexp-gen.cc", "src/builtins/builtins-regexp-gen.h", - "src/builtins/builtins-shadowrealm-gen.cc", + "src/builtins/builtins-shadow-realm-gen.cc", "src/builtins/builtins-sharedarraybuffer-gen.cc", "src/builtins/builtins-string-gen.cc", "src/builtins/builtins-string-gen.h", @@ -3215,8 +3215,8 @@ v8_header_set("v8_internal_headers") { "src/objects/js-regexp.h", "src/objects/js-segments-inl.h", "src/objects/js-segments.h", - "src/objects/js-shadow-realms-inl.h", - "src/objects/js-shadow-realms.h", + "src/objects/js-shadow-realm-inl.h", + "src/objects/js-shadow-realm.h", "src/objects/js-struct-inl.h", "src/objects/js-struct.h", "src/objects/js-temporal-objects-inl.h", @@ -4159,7 +4159,7 @@ v8_source_set("v8_base_without_compiler") { "src/builtins/builtins-object.cc", "src/builtins/builtins-reflect.cc", "src/builtins/builtins-regexp.cc", - "src/builtins/builtins-shadow-realms.cc", + "src/builtins/builtins-shadow-realm.cc", "src/builtins/builtins-sharedarraybuffer.cc", "src/builtins/builtins-string.cc", "src/builtins/builtins-struct.cc", diff --git a/src/builtins/base.tq b/src/builtins/base.tq index e72f535b35..84ac5f825e 100644 --- a/src/builtins/base.tq +++ b/src/builtins/base.tq @@ -16,7 +16,7 @@ #include 'src/objects/js-generator.h' #include 'src/objects/js-promise.h' #include 'src/objects/js-regexp-string-iterator.h' -#include 'src/objects/js-shadow-realms.h' +#include 'src/objects/js-shadow-realm.h' #include 'src/objects/js-struct.h' #include 'src/objects/js-weak-refs.h' #include 'src/objects/objects.h' diff --git a/src/builtins/builtins-shadowrealm-gen.cc b/src/builtins/builtins-shadow-realm-gen.cc similarity index 99% rename from src/builtins/builtins-shadowrealm-gen.cc rename to src/builtins/builtins-shadow-realm-gen.cc index ca981dec59..7c2223bbc2 100644 --- a/src/builtins/builtins-shadowrealm-gen.cc +++ b/src/builtins/builtins-shadow-realm-gen.cc @@ -6,7 +6,7 @@ #include "src/builtins/builtins.h" #include "src/codegen/code-stub-assembler.h" #include "src/objects/descriptor-array.h" -#include "src/objects/js-shadow-realms.h" +#include "src/objects/js-shadow-realm.h" #include "src/objects/module.h" namespace v8 { diff --git a/src/builtins/builtins-shadow-realms.cc b/src/builtins/builtins-shadow-realm.cc similarity index 99% rename from src/builtins/builtins-shadow-realms.cc rename to src/builtins/builtins-shadow-realm.cc index f071bec895..26f60a4fa2 100644 --- a/src/builtins/builtins-shadow-realms.cc +++ b/src/builtins/builtins-shadow-realm.cc @@ -5,7 +5,7 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/codegen/compiler.h" #include "src/logging/counters.h" -#include "src/objects/js-shadow-realms-inl.h" +#include "src/objects/js-shadow-realm-inl.h" namespace v8 { namespace internal { diff --git a/src/diagnostics/objects-debug.cc b/src/diagnostics/objects-debug.cc index 6a541506da..43fdf51068 100644 --- a/src/diagnostics/objects-debug.cc +++ b/src/diagnostics/objects-debug.cc @@ -54,7 +54,7 @@ #endif // V8_INTL_SUPPORT #include "src/objects/js-regexp-inl.h" #include "src/objects/js-regexp-string-iterator-inl.h" -#include "src/objects/js-shadow-realms-inl.h" +#include "src/objects/js-shadow-realm-inl.h" #ifdef V8_INTL_SUPPORT #include "src/objects/js-relative-time-format-inl.h" #include "src/objects/js-segment-iterator-inl.h" diff --git a/src/init/bootstrapper.cc b/src/init/bootstrapper.cc index 4310ae08cb..956481b115 100644 --- a/src/init/bootstrapper.cc +++ b/src/init/bootstrapper.cc @@ -52,7 +52,7 @@ #endif // V8_INTL_SUPPORT #include "src/objects/js-regexp-string-iterator.h" #include "src/objects/js-regexp.h" -#include "src/objects/js-shadow-realms.h" +#include "src/objects/js-shadow-realm.h" #ifdef V8_INTL_SUPPORT #include "src/objects/js-relative-time-format.h" #include "src/objects/js-segment-iterator.h" diff --git a/src/objects/all-objects-inl.h b/src/objects/all-objects-inl.h index 0f894f9669..2efc008a31 100644 --- a/src/objects/all-objects-inl.h +++ b/src/objects/all-objects-inl.h @@ -47,7 +47,7 @@ #include "src/objects/js-proxy-inl.h" #include "src/objects/js-regexp-inl.h" #include "src/objects/js-regexp-string-iterator-inl.h" -#include "src/objects/js-shadow-realms-inl.h" +#include "src/objects/js-shadow-realm-inl.h" #include "src/objects/js-struct-inl.h" #include "src/objects/js-temporal-objects-inl.h" #include "src/objects/js-weak-refs-inl.h" diff --git a/src/objects/js-objects.cc b/src/objects/js-objects.cc index 6c40f8d2b0..91ce284413 100644 --- a/src/objects/js-objects.cc +++ b/src/objects/js-objects.cc @@ -52,7 +52,7 @@ #include "src/objects/js-promise.h" #include "src/objects/js-regexp-inl.h" #include "src/objects/js-regexp-string-iterator.h" -#include "src/objects/js-shadow-realms.h" +#include "src/objects/js-shadow-realm.h" #ifdef V8_INTL_SUPPORT #include "src/objects/js-relative-time-format.h" #include "src/objects/js-segment-iterator.h" diff --git a/src/objects/js-shadow-realms-inl.h b/src/objects/js-shadow-realm-inl.h similarity index 69% rename from src/objects/js-shadow-realms-inl.h rename to src/objects/js-shadow-realm-inl.h index 80106e87dd..4d13592c6e 100644 --- a/src/objects/js-shadow-realms-inl.h +++ b/src/objects/js-shadow-realm-inl.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_OBJECTS_JS_SHADOW_REALMS_INL_H_ -#define V8_OBJECTS_JS_SHADOW_REALMS_INL_H_ +#ifndef V8_OBJECTS_JS_SHADOW_REALM_INL_H_ +#define V8_OBJECTS_JS_SHADOW_REALM_INL_H_ #include "src/api/api-inl.h" #include "src/heap/heap-write-barrier-inl.h" -#include "src/objects/js-shadow-realms.h" +#include "src/objects/js-shadow-realm.h" #include "src/objects/smi-inl.h" // Has to be the last include (doesn't have include guards): @@ -16,7 +16,7 @@ namespace v8 { namespace internal { -#include "torque-generated/src/objects/js-shadow-realms-tq-inl.inc" +#include "torque-generated/src/objects/js-shadow-realm-tq-inl.inc" TQ_OBJECT_CONSTRUCTORS_IMPL(JSShadowRealm) @@ -25,4 +25,4 @@ TQ_OBJECT_CONSTRUCTORS_IMPL(JSShadowRealm) #include "src/objects/object-macros-undef.h" -#endif // V8_OBJECTS_JS_SHADOW_REALMS_INL_H_ +#endif // V8_OBJECTS_JS_SHADOW_REALM_INL_H_ diff --git a/src/objects/js-shadow-realms.h b/src/objects/js-shadow-realm.h similarity index 82% rename from src/objects/js-shadow-realms.h rename to src/objects/js-shadow-realm.h index 131b7d84f8..6bba86b42d 100644 --- a/src/objects/js-shadow-realms.h +++ b/src/objects/js-shadow-realm.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_OBJECTS_JS_SHADOW_REALMS_H_ -#define V8_OBJECTS_JS_SHADOW_REALMS_H_ +#ifndef V8_OBJECTS_JS_SHADOW_REALM_H_ +#define V8_OBJECTS_JS_SHADOW_REALM_H_ #include "src/objects/js-objects.h" #include "torque-generated/bit-fields.h" @@ -16,7 +16,7 @@ namespace internal { class NativeContext; -#include "torque-generated/src/objects/js-shadow-realms-tq.inc" +#include "torque-generated/src/objects/js-shadow-realm-tq.inc" // ShadowRealm object from the JS ShadowRealm spec proposal: // https://github.com/tc39/proposal-shadowrealm @@ -36,4 +36,4 @@ class JSShadowRealm #include "src/objects/object-macros-undef.h" -#endif // V8_OBJECTS_JS_SHADOW_REALMS_H_ +#endif // V8_OBJECTS_JS_SHADOW_REALM_H_ diff --git a/src/objects/js-shadow-realms.tq b/src/objects/js-shadow-realm.tq similarity index 100% rename from src/objects/js-shadow-realms.tq rename to src/objects/js-shadow-realm.tq