Skip to content

Commit 42552a7

Browse files
committed
deps: V8: cherry-pick ad2c5dae4688
Original commit message: Merged: [deoptimizer] Stricter checks during deoptimization Revision: 506e893b812e03dbebe34b11d8aa9d4eb6869d89 BUG=chromium:1161357 NOTRY=true NOPRESUBMIT=true NOTREECHECKS=true R=​[email protected] (cherry picked from commit 44d052c19df0801fafdf2be54c899db65e79c67a) Change-Id: I97b69ae11d85bc0acd4a0c7bd28e1b692433de80 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2616219 Reviewed-by: Mythri Alle <[email protected]> Commit-Queue: Georg Neis <[email protected]> Cr-Original-Commit-Position: refs/branch-heads/8.8@{#23} Cr-Original-Branched-From: 2dbcdc105b963ee2501c82139eef7e0603977ff0-refs/heads/8.8.278@{#1} Cr-Original-Branched-From: 366d30c99049b3f1c673f8a93deb9f879d0fa9f0-refs/heads/master@{#71094} Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2649571 Reviewed-by: Victor-Gabriel Savu <[email protected]> Commit-Queue: Achuith Bhandarkar <[email protected]> Cr-Commit-Position: refs/branch-heads/8.6@{#56} Cr-Branched-From: a64aed2333abf49e494d2a5ce24bbd14fff19f60-refs/heads/8.6.395@{#1} Cr-Branched-From: a626bc036236c9bf92ac7b87dc40c9e538b087e3-refs/heads/master@{#69472} Refs: v8/v8@ad2c5da PR-URL: #38275 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Shelley Vohr <[email protected]>
1 parent aff53dd commit 42552a7

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.41',
39+
'v8_embedder_string': '-node.42',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/v8/src/deoptimizer/deoptimizer.cc

+1
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ class ActivationsFinder : public ThreadVisitor {
249249
SafepointEntry safepoint = code.GetSafepointEntry(it.frame()->pc());
250250
int trampoline_pc = safepoint.trampoline_pc();
251251
DCHECK_IMPLIES(code == topmost_, safe_to_deopt_);
252+
CHECK_GE(trampoline_pc, 0);
252253
// Replace the current pc on the stack with the trampoline.
253254
// TODO(v8:10026): avoid replacing a signed pointer.
254255
Address* pc_addr = it.frame()->pc_address();

0 commit comments

Comments
 (0)