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

Update JNI Target relocation record to have offset to the reloLocation. #6331

Closed
wants to merge 1 commit into from

Conversation

dsouzai
Copy link
Member

@dsouzai dsouzai commented Feb 3, 2022

Reverts1 #6330 which was a revert of #6326

On x86, the JNI Target relocation puts the incorrect address when
generating a Runtime Assumption. However, the address that the
relocation infra itself needs to patch is correct. Thus, the relo record
has to hold not just the location to patch but also the location to
register the assumption against. This is the same on most platforms, but
different on x86.

eclipse-openj9/openj9#14421 depends on this change; OpenJ9 will be broken without a coordinated merge.


  1. Note: because of the force push, this is no longer technically a revert. However, the force push only updated copyrights in a comment block, and so there is no functional difference between this PR and Update JNI Target relocation record to have offset to the reloLocation. #6326.

Copy link
Contributor

@jdmpapin jdmpapin left a comment

Choose a reason for hiding this comment

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

LGTM once both files' copyright dates are updated

@dsouzai dsouzai force-pushed the revert-6330-revert-6326-jniRelo branch from 8065fe0 to bcdb0b9 Compare February 4, 2022 16:07
@dsouzai
Copy link
Member Author

dsouzai commented Feb 4, 2022

Copyrights updated in force push.

@jdmpapin
Copy link
Contributor

jdmpapin commented Feb 4, 2022

@mstoodle, I diffed the diffs and these are exactly the changes that you already approved in #6326, except that the copyright dates are also updated

Copy link
Contributor

@mstoodle mstoodle left a comment

Choose a reason for hiding this comment

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

Still looks fine (even better with the updated copyrights...good catch!).

@dsouzai
Copy link
Member Author

dsouzai commented Feb 4, 2022

Gonna have to open yet another PR; because I force pushed, it's causing OpenJ9 OMR mirroring to fail.

@dsouzai dsouzai closed this Feb 4, 2022
@dsouzai dsouzai deleted the revert-6330-revert-6326-jniRelo branch February 4, 2022 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants