From f09c033fafe9835814387ed71999b97745388b59 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Mon, 22 Mar 2021 18:36:48 +0200 Subject: [PATCH] deps: backport v8 f19142e6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [top-level-await] Implement the new post-order requirement for async subgraphs Refs: https://github.com/v8/v8/commit/f19142e6139979da3a177cb0b9f382e459f5ccec PR-URL: https://github.com/nodejs/node/pull/37864 Backport-PR-URL: https://github.com/nodejs/node/pull/37985 Reviewed-By: Michaël Zasso Reviewed-By: Colin Ihrig --- deps/v8/src/common/globals.h | 3 + deps/v8/src/diagnostics/objects-debug.cc | 3 +- deps/v8/src/diagnostics/objects-printer.cc | 1 + deps/v8/src/execution/isolate-inl.h | 31 +++ deps/v8/src/execution/isolate.cc | 3 + deps/v8/src/execution/isolate.h | 18 ++ deps/v8/src/heap/factory.cc | 2 +- deps/v8/src/objects/module-inl.h | 8 +- deps/v8/src/objects/source-text-module.cc | 243 ++++++++++++------ deps/v8/src/objects/source-text-module.h | 36 ++- deps/v8/src/objects/source-text-module.tq | 2 +- ...ules-import-rqstd-order-async-subgraph.mjs | 11 + .../harmony/modules-skip-async-subgraph-1.mjs | 12 + .../harmony/modules-skip-async-subgraph-2.mjs | 12 + .../modules-skip-async-subgraph-async.mjs | 12 + .../modules-skip-async-subgraph-start.mjs | 14 + .../harmony/modules-skip-async-subgraph-x.mjs | 12 + 17 files changed, 336 insertions(+), 87 deletions(-) create mode 100644 deps/v8/test/mjsunit/harmony/modules-import-rqstd-order-async-subgraph.mjs create mode 100644 deps/v8/test/mjsunit/harmony/modules-skip-async-subgraph-1.mjs create mode 100644 deps/v8/test/mjsunit/harmony/modules-skip-async-subgraph-2.mjs create mode 100644 deps/v8/test/mjsunit/harmony/modules-skip-async-subgraph-async.mjs create mode 100644 deps/v8/test/mjsunit/harmony/modules-skip-async-subgraph-start.mjs create mode 100644 deps/v8/test/mjsunit/harmony/modules-skip-async-subgraph-x.mjs diff --git a/deps/v8/src/common/globals.h b/deps/v8/src/common/globals.h index dbc6b9af9be02a..f75544b56c0e9e 100644 --- a/deps/v8/src/common/globals.h +++ b/deps/v8/src/common/globals.h @@ -349,6 +349,9 @@ constexpr int kUC16Size = sizeof(uc16); // NOLINT // 128 bit SIMD value size. constexpr int kSimd128Size = 16; +// Maximum ordinal used for tracking asynchronous module evaluation order. +constexpr unsigned kMaxModuleAsyncEvaluatingOrdinal = (1 << 30) - 1; + // FUNCTION_ADDR(f) gets the address of a C function f. #define FUNCTION_ADDR(f) (reinterpret_cast(f)) diff --git a/deps/v8/src/diagnostics/objects-debug.cc b/deps/v8/src/diagnostics/objects-debug.cc index 054b9dec175fb2..ee8827f8f639f3 100644 --- a/deps/v8/src/diagnostics/objects-debug.cc +++ b/deps/v8/src/diagnostics/objects-debug.cc @@ -1390,7 +1390,8 @@ void SourceTextModule::SourceTextModuleVerify(Isolate* isolate) { (status() == kPreInstantiating && code().IsSharedFunctionInfo()) || (status() == kUninstantiated && code().IsSharedFunctionInfo())); CHECK(top_level_capability().IsUndefined() && !AsyncParentModuleCount() && - !pending_async_dependencies() && !async_evaluating()); + !pending_async_dependencies()); + CHECK(!IsAsyncEvaluating()); } CHECK_EQ(requested_modules().length(), info().module_requests().length()); diff --git a/deps/v8/src/diagnostics/objects-printer.cc b/deps/v8/src/diagnostics/objects-printer.cc index 843d65cd1f7f61..9e24b5c41d1997 100644 --- a/deps/v8/src/diagnostics/objects-printer.cc +++ b/deps/v8/src/diagnostics/objects-printer.cc @@ -1602,6 +1602,7 @@ void SourceTextModule::SourceTextModulePrint(std::ostream& os) { // NOLINT os << "\n - script: " << Brief(script()); os << "\n - import_meta: " << Brief(import_meta()); os << "\n - cycle_root: " << Brief(cycle_root()); + os << "\n - async_evaluating_ordinal: " << async_evaluating_ordinal(); os << "\n"; } diff --git a/deps/v8/src/execution/isolate-inl.h b/deps/v8/src/execution/isolate-inl.h index b3a84d01bec1e6..e39b75f02508dc 100644 --- a/deps/v8/src/execution/isolate-inl.h +++ b/deps/v8/src/execution/isolate-inl.h @@ -13,6 +13,7 @@ #include "src/objects/property-cell.h" #include "src/objects/regexp-match-info.h" #include "src/objects/shared-function-info.h" +#include "src/objects/source-text-module.h" namespace v8 { namespace internal { @@ -118,6 +119,36 @@ Isolate::ExceptionScope::~ExceptionScope() { isolate_->set_pending_exception(*pending_exception_); } +void Isolate::DidFinishModuleAsyncEvaluation(unsigned ordinal) { + // To address overflow, the ordinal is reset when the async module with the + // largest vended ordinal finishes evaluating. Modules are evaluated in + // ascending order of their async_evaluating_ordinal. + // + // While the specification imposes a global total ordering, the intention is + // that for each async module, all its parents are totally ordered by when + // they first had their [[AsyncEvaluating]] bit set. + // + // The module with largest vended ordinal finishes evaluating implies that the + // async dependency as well as all other modules in that module's graph + // depending on async dependencies are finished evaluating. + // + // If the async dependency participates in other module graphs (e.g. via + // dynamic import, or other