Skip to content

JIT ASi cherry-picks #1610

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Aug 6, 2020
Merged

JIT ASi cherry-picks #1610

merged 2 commits into from
Aug 6, 2020

Conversation

compnerd
Copy link
Member

@compnerd compnerd commented Aug 6, 2020

Cherry-pick a couple of commits from master to fix JIT issues with the PAGEOFF12 relocation with addend cases.

lhames added 2 commits August 6, 2020 08:44
@lhames @compnerd
[JITLink][AArch64] Handle addends on PAGE21 / PAGEOFF12 relocations.
b8219ea 
(cherry picked from commit 47cfffe)
@lhames @compnerd
[JITLink][MachO][AArch64] More PAGEOFF12 relocation fixes.
3ae80f2 
Correctly sign extend the addend, and fix implicit shift operand decoding
(it incorrectly returned 0 for some cases), and check that the initial
encoded immediate is 0.

(cherry picked from commit ba8683f)
@compnerd
Copy link
Member Author

compnerd commented Aug 6, 2020

CC: @lhames @hyp

@compnerd
Copy link
Member Author

compnerd commented Aug 6, 2020

@swift-ci please test

@lhames lhames requested review from lhames and lgerbarg August 6, 2020 15:54
lhames
lhames approved these changes Aug 6, 2020
View reviewed changes
Copy link

@lhames lhames left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested locally. Fixes rdar://66285639.

@lhames lhames requested a review from cooperp August 6, 2020 17:40
@cooperp
Copy link

cooperp commented Aug 6, 2020

LGTM.

@lhames lhames merged commit a1b040b into swiftlang:apple/stable/20200108 Aug 6, 2020
@compnerd compnerd deleted the jit-asi branch September 28, 2020 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhames lhames lhames approved these changes

@cooperp cooperp cooperp approved these changes

@lgerbarg lgerbarg Awaiting requested review from lgerbarg

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@compnerd @cooperp @lhames