Skip to content

Commit

Permalink
deps: V8: cherry-pick 9a607043cb31
Browse files Browse the repository at this point in the history
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: v8/v8@9a60704

PR-URL: #40046
Fixes: #40030
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
  • Loading branch information
gengjiawen authored and targos committed Oct 4, 2021
1 parent 8de5eb8 commit 5cc24e6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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 #####

Expand Down
4 changes: 2 additions & 2 deletions deps/v8/src/objects/lookup.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1527,8 +1527,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 =
Expand Down

0 comments on commit 5cc24e6

Please sign in to comment.