Skip to content

Commit 7988ac0

Browse files
victorgomesmibrunin
authored andcommitted
[Backport] Security bug 431828026
Cherry-pick of patch originally reviewed on https://chromium-review.googlesource.com/c/v8/v8/+/6781180: Merged: [arm64] Consider branch when skipping a veener pool ... in InstructionAccurateScope. Bug: 431828026 (cherry picked from commit 53786ab8bc425bb0fa25c5ea5f8c5a3ee6ef2481) Change-Id: I60416714d2b3b5f7876d5eb4bd6467898d3b9226 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6781180 Commit-Queue: Victor Gomes <victorgomes@chromium.org> Auto-Submit: Victor Gomes <victorgomes@chromium.org> Reviewed-by: Leszek Swirski <leszeks@chromium.org> Commit-Queue: Leszek Swirski <leszeks@chromium.org> Cr-Commit-Position: refs/branch-heads/13.8@{#60} Cr-Branched-From: 61ddd471ece346840bbebbb308dceb4b4ce31b28-refs/heads/13.8.258@{#1} Cr-Branched-From: fdb5de2c741658e94944f2ec1218530e98601c23-refs/heads/main@{#100480} Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/665029 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
1 parent 0ab0acf commit 7988ac0

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

chromium/v8/src/codegen/arm64/macro-assembler-arm64.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2372,7 +2372,9 @@ class V8_NODISCARD InstructionAccurateScope {
23722372
#endif
23732373
{
23742374
DCHECK_GT(count, 0);
2375-
masm_->CheckVeneerPool(false, true, count * kInstrSize);
2375+
// We include the branch instruction in the veneer distance margin if we
2376+
// need to emit a veneer pool.
2377+
masm_->CheckVeneerPool(false, true, (count + 1) * kInstrSize);
23762378
masm_->StartBlockVeneerPool();
23772379
#ifdef DEBUG
23782380
masm_->bind(&start_);

0 commit comments

Comments
 (0)