From 04f1943109254449acf4d033029a82ec0fcaf287 Mon Sep 17 00:00:00 2001 From: Jiawen Geng Date: Thu, 9 Sep 2021 06:38:19 +0000 Subject: [PATCH 1/2] deps: V8: cherry-pick 9a607043cb31 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: [compiler] Gracefully handle an unsupported situation ... by skipping the optimization instead of CHECK-failing. Bug: v8:12188 Change-Id: I6709bf1c55506f3d12886efbfbb9934788cd02ce Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3148132 Auto-Submit: Georg Neis Commit-Queue: Jakob Gruber Reviewed-by: Jakob Gruber Cr-Commit-Position: refs/heads/main@{#76741} Refs: https://github.com/v8/v8/commit/9a607043cb3161f8ceae1583807bece595388108 PR-URL: https://github.com/nodejs/node/pull/40046 Fixes: https://github.com/nodejs/node/issues/40030 Reviewed-By: Michaël Zasso Reviewed-By: Richard Lau --- common.gypi | 2 +- deps/v8/src/objects/lookup.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common.gypi b/common.gypi index 0f8999f4079994..013f24b107408f 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.11', + 'v8_embedder_string': '-node.12', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/objects/lookup.cc b/deps/v8/src/objects/lookup.cc index 235a5547626534..9ec1f7fa2a04bf 100644 --- a/deps/v8/src/objects/lookup.cc +++ b/deps/v8/src/objects/lookup.cc @@ -1518,8 +1518,8 @@ base::Optional ConcurrentLookupIterator::TryGetPropertyCell( DisallowGarbageCollection no_gc; Map holder_map = holder->map(); - CHECK(!holder_map.is_access_check_needed()); - CHECK(!holder_map.has_named_interceptor()); + if (holder_map.is_access_check_needed()) return {}; + if (holder_map.has_named_interceptor()) return {}; GlobalDictionary dict = holder->global_dictionary(kAcquireLoad); base::Optional cell = From 711e073596f29b047086e2f3d4ab3706b98462f7 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 10 Sep 2021 11:23:47 -0400 Subject: [PATCH 2/2] 2021-09-10, Version 16.9.1 (Current) Notable changes: This release fixes a regression introduced by the V8 9.3 update in Node.js 16.9.0. PR-URL: https://github.com/nodejs/node/issues/40069 --- CHANGELOG.md | 3 ++- doc/changelogs/CHANGELOG_V16.md | 12 ++++++++++++ src/node_version.h | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 297c6a7f1e4b45..3c265902e7e281 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,7 +32,8 @@ release. -16.9.0
+16.9.1
+16.9.0
16.8.0
16.7.0
16.6.2
diff --git a/doc/changelogs/CHANGELOG_V16.md b/doc/changelogs/CHANGELOG_V16.md index b178b036380baf..128467175d01df 100644 --- a/doc/changelogs/CHANGELOG_V16.md +++ b/doc/changelogs/CHANGELOG_V16.md @@ -10,6 +10,7 @@ +16.9.1
16.9.0
16.8.0
16.7.0
@@ -46,6 +47,17 @@ * [io.js](CHANGELOG_IOJS.md) * [Archive](CHANGELOG_ARCHIVE.md) + +## 2021-09-10, Version 16.9.1 (Current), @richardlau + +### Notable Changes + +This release fixes a [regression](https://github.com/nodejs/node/issues/40030) introduced by the V8 9.3 update in Node.js 16.9.0. + +### Commits + +* [[`04f1943109`](https://github.com/nodejs/node/commit/04f1943109)] - **deps**: V8: cherry-pick 9a607043cb31 (Jiawen Geng) [#40046](https://github.com/nodejs/node/pull/40046) + ## 2021-09-07, Version 16.9.0 (Current), @targos diff --git a/src/node_version.h b/src/node_version.h index c1050d02345b5f..48b8d9f22fb98d 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -29,7 +29,7 @@ #define NODE_VERSION_IS_LTS 0 #define NODE_VERSION_LTS_CODENAME "" -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)