From 5cc24e6d760b10b500dadf2f950307e3d3c338f0 Mon Sep 17 00:00:00 2001 From: Jiawen Geng Date: Thu, 9 Sep 2021 06:38:19 +0000 Subject: [PATCH] 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 a1778597eed3da..c33f4429dbcb55 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.10', + 'v8_embedder_string': '-node.11', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/objects/lookup.cc b/deps/v8/src/objects/lookup.cc index 283e4f84d5330b..eb09aa603186e4 100644 --- a/deps/v8/src/objects/lookup.cc +++ b/deps/v8/src/objects/lookup.cc @@ -1527,8 +1527,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 =