Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: cherry-pick 28b9c1c04e78 from v8 #36879

Merged
merged 2 commits into from
Jan 12, 2023

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Jan 11, 2023

Merged: [arm] Do not emit the constant pool before a branch

After computing the branch offset but before emitting the actual branch,
we should not emit a constant pool. Otherwise the previously computed
offset would be off.

Instead of handling this indirectly via the Assembler::branch_offset
method, do this directly in the Assembler::b method (and friends), so it
is not missed on other call sites.

R=nicohartmann@chromium.org

(cherry picked from commit 9be597d194e108ba718610b9a611fe19a0fbfde5)
Bug: chromium:1399424

Change-Id: Ie30ba70508b4fb8913f79e049a33108608915704
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4118864
Reviewed-by: Nico Hartmann nicohartmann@chromium.org
Commit-Queue: Clemens Backes clemensb@chromium.org
Cr-Commit-Position: refs/branch-heads/10.8@{#48}
Cr-Branched-From: f1bc03fd6b4c201abd9f0fd9d51fb989150f97b9-refs/heads/10.8.168@{#1}
Cr-Branched-From: 237de893e1c0a0628a57d0f5797483d3add7f005-refs/heads/main@{#83672}

Notes: Security: backported fix for 1399424.

@ppontes ppontes requested review from a team as code owners January 11, 2023 14:19
@ppontes ppontes added 21-x-y backport-check-skip Skip trop's backport validity checking security 🔒 semver/patch backwards-compatible bug fixes labels Jan 11, 2023
@ppontes ppontes marked this pull request as draft January 11, 2023 18:39
@ppontes ppontes marked this pull request as ready for review January 11, 2023 21:25
@codebytere codebytere merged commit 61af436 into 21-x-y Jan 12, 2023
@codebytere codebytere deleted the cherry-pick/21-x-y/v8/28b9c1c04e78 branch January 12, 2023 10:58
@release-clerk
Copy link

release-clerk bot commented Jan 12, 2023

Release Notes Persisted

Security: backported fix for 1399424.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
21-x-y backport-check-skip Skip trop's backport validity checking security 🔒 semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants