From dd5da301c8c5706ba95ffcb9520679838d032194 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Tue, 30 Mar 2021 01:39:23 +0200 Subject: [PATCH] deps: backport v8 5f90cfd7 [torque] Move SourceTextModule flags definitions to Torque Refs: https://github.com/v8/v8/commit/5f90cfd754b96bd74690c2e2ab40f070bb620aa6 PR-URL: https://github.com/nodejs/node/pull/37973 Reviewed-By: Richard Lau --- common.gypi | 2 +- deps/v8/src/objects/module-inl.h | 5 +++-- deps/v8/src/objects/source-text-module.h | 4 ++-- deps/v8/src/objects/source-text-module.tq | 7 ++++++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/common.gypi b/common.gypi index 0235880edf83bb..902d69c6272fb7 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.27', + 'v8_embedder_string': '-node.28', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/objects/module-inl.h b/deps/v8/src/objects/module-inl.h index 80bfa7b4d6b2ae..d270a9cdfc3671 100644 --- a/deps/v8/src/objects/module-inl.h +++ b/deps/v8/src/objects/module-inl.h @@ -36,8 +36,9 @@ ACCESSORS(Module, exception, Object, kExceptionOffset) SMI_ACCESSORS(Module, status, kStatusOffset) SMI_ACCESSORS(Module, hash, kHashOffset) -BOOL_ACCESSORS(SourceTextModule, flags, async, kAsyncBit) -BOOL_ACCESSORS(SourceTextModule, flags, async_evaluating, kAsyncEvaluatingBit) +BOOL_ACCESSORS(SourceTextModule, flags, async, AsyncBit::kShift) +BOOL_ACCESSORS(SourceTextModule, flags, async_evaluating, + AsyncEvaluatingBit::kShift) ACCESSORS(SourceTextModule, async_parent_modules, ArrayList, kAsyncParentModulesOffset) ACCESSORS(SourceTextModule, top_level_capability, HeapObject, diff --git a/deps/v8/src/objects/source-text-module.h b/deps/v8/src/objects/source-text-module.h index d716674c12d01a..aceccd64ba2be0 100644 --- a/deps/v8/src/objects/source-text-module.h +++ b/deps/v8/src/objects/source-text-module.h @@ -7,6 +7,7 @@ #include "src/objects/module.h" #include "src/objects/promise.h" +#include "torque-generated/bit-fields-tq.h" // Has to be the last include (doesn't have include guards): #include "src/objects/object-macros.h" @@ -94,8 +95,7 @@ class SourceTextModule inline void DecrementPendingAsyncDependencies(); // Bits for flags. - static const int kAsyncBit = 0; - static const int kAsyncEvaluatingBit = 1; + DEFINE_TORQUE_GENERATED_SOURCE_TEXT_MODULE_FLAGS() // async_evaluating, top_level_capability, pending_async_dependencies, and // async_parent_modules are used exclusively during evaluation of async diff --git a/deps/v8/src/objects/source-text-module.tq b/deps/v8/src/objects/source-text-module.tq index 091a267cb6f01a..a9e3ee3db9a793 100644 --- a/deps/v8/src/objects/source-text-module.tq +++ b/deps/v8/src/objects/source-text-module.tq @@ -4,6 +4,11 @@ type SourceTextModuleInfo extends FixedArray; +bitfield struct SourceTextModuleFlags extends uint31 { + async: bool: 1 bit; + async_evaluating: bool: 1 bit; +} + @generateCppClass extern class SourceTextModule extends Module { // The code representing this module, or an abstraction thereof. @@ -44,7 +49,7 @@ extern class SourceTextModule extends Module { // The number of currently evaluating async dependencies of this module. pending_async_dependencies: Smi; - flags: Smi; + flags: SmiTagged; } @generateCppClass