diff options
| author | Jiawen Geng <technicalcute@gmail.com> | 2021-09-09 09:38:19 +0300 |
|---|---|---|
| committer | Richard Lau <rlau@redhat.com> | 2021-09-10 18:15:04 +0300 |
| commit | 04f1943109254449acf4d033029a82ec0fcaf287 (patch) | |
| tree | 04d2bab540ce8c127dbf72365deb7c95ac1b87c6 | |
| parent | b51b55ca9edd3d5c43598ccb6cea8eaad5405f44 (diff) | |
deps: V8: cherry-pick 9a607043cb31
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 <neis@chromium.org>
Commit-Queue: Jakob Gruber <jgruber@chromium.org>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
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 <targos@protonmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
| -rw-r--r-- | common.gypi | 2 | ||||
| -rw-r--r-- | deps/v8/src/objects/lookup.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common.gypi b/common.gypi index 0f8999f4079..013f24b1074 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 235a5547626..9ec1f7fa2a0 100644 --- a/deps/v8/src/objects/lookup.cc +++ b/deps/v8/src/objects/lookup.cc @@ -1518,8 +1518,8 @@ base::Optional<PropertyCell> 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<PropertyCell> cell = |